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