Improvements in build.sh #2