Improvements in build.sh #5