Fix for Issue #116
Merge pull request #134 from gitcac/issue-73-116

Fix for Issue #116