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