Working on #14 implementation
Merge pull request #584 from emmanuel-keller/1.5

Working on #14 implementation