Fixing map feature
Merge branch 'master' of https://github.com/mariofilino/SafeIn