Makefile pull request

Makefile done.