Merge pull request #1 from jaeksoft/master

Synch with master ? Maybe