Update game
Merge remote-tracking branch 'origin'
Minor bug fixes