Merge pull request #20 from UPDDI/Issue-#172

Issue #172
Merge pull request #21 from UPDDI/Issue-#172

Issue #172