Fix for mplayer. I still don't like this implementation...
Merge branch 'master' of https://github.com/0x1001/jarvis