Update Makefile and README