Calendar now mutch stable
Merge origin/master