Updated README and Makefiles