Revise setup.sh script
Merge branch 'master' into mac