Bug Fix and Enhancement of setup.sh

No match.