Resolved Issue #4