Gh161 rebase

PR for Issue #161, supercedes PR #164