Updated Makefile & build.sh