Update setup.sh
merge from sandyzhang's branch