Improve Makefile and README.md