Tweak Makefile and README