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