Minor bug fixes
Adding mapping by Type Inputs
Merge branch 'master' of https://github.com/jtstriker3/Joe.Map