Implementation of Issue #109
Merge pull request #123 from gitcac/issue-109

Implementation of Issue #109