Improve music categorizing.
Merge pull request #101 from nZEDb/dev

Improve music categorizing.