The code from PR #162 needs to be vetted and injected into the main branch
The code from PR #162 needs to be vetted and injected into the main branch