Issue #112 Implementation
Merge pull request #122 from gitcac/issue-112

Issue #112 Implementation