Updated doc

-Added modifications of Olivier
-Added a Makefile