Updated Makefile and README