Merge branch 'devel_c_Music_s2_issue#45' into devel_c
Merge branch 'devel_c_Music_s2_issue#45' into devel_c
Merge branch 'devel_c' of https://github.com/eloipuertas/ES2014A into devel_c