add setup map with single mopa
Merge remote-tracking branch 'origin/master'