Merge pull request #8 from d-faure/master

Cf. Changelog
Cf. Changelog