Resolved Issue #19