fixes for issues #24 and #25
Merge branch 'master3' of github.com:schedup/schedup into master3