fixed error with two players
Merge remote-tracking branch 'origin/master' into dan-dev