Updated makefile
Updated scripts