Some fixes:)
Merge pull request #1 from joop2001/pcplayer