Updated build script to use latest from master