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