Merge pull request #26 from bostak/benoit

Benoit