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