Small Scheduler changes
Merge pull request #35 from nmcglohon/Sean7

Small Scheduler changes