Fix start and end dates
clarify calendar and fix naming
Merge remote-tracking branch 'upstream/master'