Merge pull request #2864 from browner12/patch-1

simplify calendar library