updated for minimal game
Merge branch 'master' into gh-pages