Update Makefile
Update build script