Issue 29 Resolved