Implementation of Issue #245
Merge pull request #286 from gitcac/issue-245

Implementation of Issue #245