update readme.md
Merge branch 'master_setup'