add and modify domain
Merge branch 'origin/master'