Proposed resolution to bug 26659
addressed first PR comments
Merge pull request #18 from boblund/bug26659

Proposed resolution to bug 26659