Updated doc and makefile