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