modif by simon
Merge pull request #1 from soffredo/master

modif by simon