fixes #3
Merge branch 'master' of github.com:terhorst/calteach