sync
Merge pull request #8 from olivier-squid/master

sync