Merge branch 'v1.3.0-beta'
Merge branch 'master' of https://github.com/Galaxias/FitScore