Makefile and README.MD changes