Merge pull request #6 from J-Christophe/master

New version
Merge pull request #7 from J-Christophe/master

Cleaning