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