Implementing outcome of Issue #42
Implementing outcome of Issue #42