first modification
?
lot of stuff modified
ahahahah v1 to v2 ok
Merge branch 'master' into Nicolas