Fix Issue #27
Merge pull request #29 from UPDDI/Issue-#27

Fix Issue #27