New mappings to resolve https://www.pivotaltracker.com/story/show/51707691
Merge pull request #342 from rjc123/master

New mappings to resolve https://www.pivotaltracker.com/story/show/517076...