Enhancement complete, as requested (Issue #18)