Issue #171 completed