Fixed ticket #30
Merge branch 'master' into feature/sidebar