Merge
Add mpdclient