map etc
Merge pull request #797 from luixxiul/development

map etc