Issue #1 Resolved