Merge pull request #20 from d-faure/master

Cf . Changelog
Merge pull request #21 from d-faure/master

Cf . Changelog
Cf . Changelog