Merge pull request #156 from p12nGH/noncontiguous_harts