add mp3 support
merge