Merge pull request #26 from realraum/sidebar