new mpd format
update
Merge branch 'master' into desktop