Implementation of Issue #101
Merge pull request #128 from gitcac/issue-101

Implementation of Issue #101