Fixes #35
Merge branch 'master' of github.com:musictheory/oj