Music stuff
Merge pull request #10 from atoiva/master

Music stuff