Updated Makefile to newest version