Implementation of Issue #110

Short Description
Bug Fix for Issue #110
Merge pull request #130 from gitcac/issue-110

Issue #110 Implementation