Merge pull request #3 from kelvin088/master

Mapeos Kelvin
mappings
request merges
mappings refactoring
Cambio Spring