Modified setup script.
Merge branch 'hotfix-test'