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