Working on #14 implementation
Merge pull request #586 from emmanuel-keller/master

Working on #14 implementation