Merge pull request #1 from reutenauer/master

Sync