Close #299
Improve the player/ball collision system