Improved Makefile and README