Merge branch 'hotfix/1.0.1'
Fix sintax error on maps module
Merge branch 'hotfix/1.0.2' into develop