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