Merge pull request #30 from bostak/benoit

Benoit