Issue #172:  match build.sh to feature branch