modified setup.sh
Merge branch 'hotfix/20130822'