Updated player
Merge remote-tracking branch 'upstream/master'
Merge pull request #11 from imwinter/master

New Pull Request