! Fix a few calendar bugs

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #786 from Oldiesmann/release-2.1

! Fix a few calendar bugs