NEW - Enhancement github issue #1