Merge pull request #268 from jkuk/master

couple minor bug  fixes
small calendar panel fix courtesy of richardo hayeso.