Implementation of Issue #278
Merge pull request #284 from gitcac/issue-278

Implementation of Issue #278