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