Changed lyrics regexp from _ to ' '
Fixed problems caused by tests.
Added support to melodies.