Improved player behaviour
Merge branch 'Player'