Improvements to music.
Merge pull request #185 from nZEDb/dev

Improvements to music.