Merge pull request #109 from seesmith/master

Add calendars and tidy-up
LIB001-667 Calendars Collection
Merge remote-tracking branch 'upstream/master'