updated player
Merge 'master'