Change to a single mapping
Merge pull request #281 from rjc123/newmappings

Change to a single mapping