update build script
merge commits