Some Improvements and Mapping other method not present in tests
Merge branch 'master' of https://github.com/geosdi/geo-platform