Modification de Ecriture et du main
Merge pull request #1 from guillaumepacquet/Ned

Merge master&ned