Updated Calendar scheduler
Merge.