change texts
add map
Merge branch 'develop'