Merge pull request #66 from Maaack/updates-from-game-template