f
Merge branch 'master' of https://github.com/corradio/Pingwee-Player
Minor bugs corrected