Revised HMT mappings
Merge pull request #121 from rjc123/newmappings

Revised HMT mappings