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