Issue #3 Resolved