Issue #230 improvements