Fixed the 'get' method for calendar
Merge remote-tracking branch 'origin/master'