*Fixed DO-3798
Merge pull request #7 from cyrilraja/master

*Fixed DO-3798