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