Fixes for Issue #154
Merge pull request #155 from UPDDI/Issue-#154

Merge Fixes for Issue #154