Make GameController return consistent objects
Merge pull request #22 from bartek/master

Make GameController return consistent objects