Merge pull request #190 from jkuk/master

fixing stuff
uploading richard's changes for calendar