Makefile and readme updates