Resolved Issue #144