Fixes for Issue #146
Merge pull request #150 from UPDDI/Issue-#146

Merge Fixes for Issue #146