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