Updated player
Merge with master