Updated Makefile