Fixes #81
Merge branch 'master' of https://github.com/z411/trackma