Improved build.cmd