Resolved Issue 16