Updating and adding Makefile