new default map
Merge branch 'origin/master'