Tiny bit on the schedule #16

Closed
mih wants to merge 2 commits from onschedule into master