Updates for v1.1
Merge https://github.com/jwdafoe/FitTrack