Factored Makefile
Update README.md