Made build.sh a bit more rescilient
Merge branch 'GideonLeGrange-master'