Refactoring now works
Merge branch 'master' of https://github.com/vdewinter/QuakeTracker