Merge branch 'gh-pages'
more set players
Merge branch 'master' into gh-pages