Calendar work
Merge pull request #5 from efsny95/master

Calendar work