New mappings
Removed fabricated urls
Merge pull request #175 from rjc123/master

New mappings