Merge branch 'CalZoneVUB/master'
Merge branch 'CalZoneVUB/master'
minor changes in rules and testing
Merge pull request #174 from yocoppen/Scheduling

Scheduling update