Better error handling, add support for mp3/ogg-vorbis
Merge conflict