Revise copying method in setup.sh
Merge branch 'master' into mac