Merge some Updates for Madsonic Client.