Devel c music s2 issue#45

Merge de l'issue45 a devel c. Falta de revisar.