Merge pull request #291 from leider/master

hotfix for calendar display
Merge remote-tracking branch 'upstream/master'