Merge pull request #173 from gioman/master

update calendar