Updated with new humdrum master branch.