Implementation of Issue #84
Merge pull request #96 from gitcac/issue-84

Implementation of Issue #84