Merge pull request #147 from yocoppen/Scheduling

Scheduling update
Merge branch 'CalZoneVUB/Scheduler'