Fixed #42
Merge branch 'master' of github.com:apachols/shorttrack