notice and cal update
Merge pull request #35 from garcha/master

notice and cal update