Resolved Issue #9