Updated makefile and README