Resolved Issue 118