Updating makefile and documentation