Implementation of Issue #105
Merge pull request #136 from gitcac/issue-105

Implementation of Issue #105