Before merge.
Merge branch 'master' of https://github.com/robotustra/pplayer
Merge branch 'master' of https://github.com/robotustra/pplayer