Calendar Cleanup
Merge pull request #190 from jayfo/calendar

Calendar Cleanup