forslund Merge pull request #20 from forslund/update-mpd