Issue #18 enhancement