Tests in game
Merge remote-tracking branch 'upstream/master'
Merge pull request #15 from uipo/master

Tests in game