Merge pull request #1 from jaeksoft/master

Synch with master ? Maybe
Merge pull request #417 from Sebastien-Andrivet/master

#1 First Pull Request !! ;-)