Handle empty and default calendar values
Merge pull request #289 from roland-d/calendarDefault

Handle empty and default calendar values