Calendar update fixes
Merge pull request #2 from d-g-h/iss2015Update

Calendar update fixes