modified setup.sh
Merge branch 'testing'