Bug fixes in setup.sh. issue #14