Merge pull request #814 from narfbg/develop-calendar

Improve the Calendar library