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