First testable version
Merge pull request #445 from emmanuel-keller/master

First testable version