Resolved Issue 28 and 27