Calendar fixes
Merge branch 'master' of github.com:F4R0N/kramkroae