Resolved Issue #7