fixes several issues: #630, #631, #632
Merge pull request #634 from synopia/gametype

Fixes several issues: #630, #631, #632