Merge pull request #353 from rjc123/newmappings

New mappings