Issue #15: build script updates