Merge changes
Merge branch 'master' of https://github.com/webdevleo/webplayer
Merge