More newmappings
Merge pull request #363 from rjc123/newmappings

More newmappings