Update mappings

This pull request fixes a minor issue regarding the help lookup, it also resolves issue #27.