Issue fixed and tested
Merge pull request #200 from lyncode/DS-1507

Issue fixed and tested