Feature enhancement for Issue #15