Updated information
Merge branch 'master' of github.com:mikemolina/kalendas