Fixed bugs with calendar
Merge pull request #65 from JonNatanael/master

Fixed bugs with calendar