Updated Makefile and README.rst