Update build script
Merge latest changes