Merge "Bug Fix and Enhancement of setup.sh"