Implementation of Issue #282
Merge pull request #285 from gitcac/issue-282

Implementation of Issue #282