Completed enhancement Issue #4.