Added and modified makefile