putting the right mappings back
Merge branch 'master' of https://github.com/nalroff/Gremlin.git
Merge remote-tracking branch 'origin/master'