Merge pull request #38 from bostak/benoit

Benoit