Fix model in Player as well
Merge branch 'master' into gh-pages