Fixes #21
Merge branch 'master' into feature/restyle-schedule