Working on #14 implementation
Merge pull request #585 from emmanuel-keller/1.6

Working on #14 implementation