Updated Mapping configurations
Merge pull request #3 from federosky/development

Updated Mapping configurations