Merge pull request #31 from confpub/master

Latest schedule changes