Merge pull request #74 from g-humbert/master

Resynch
Merge pull request #13 from oster/master

Synchronisation