Merge "fixing grammar in setup.sh script"