Resolved Issue #8