Merge pull request #111 from ceci/master

Hopefully last change to the schedule