Added updated makefile