Improved build script.
Update