Improved build script
XXX