calendar update
Merge pull request #46 from jvcasill/master

calendar update