Updated makefile