More HSoM changes
Merge branch 'master' of https://github.com/Euterpea/Euterpea