correction player
Merge branch 'master' into integration