Issue #158 complete