Fix Issue #23
Merge pull request #28 from UPDDI/Issue-23

Fix Issue #23