JIRA Issue 39 - Resolved