Updated doc to match the evolution #14 #15