Resolved Issue #183