Merging latest hindemith code