Resolves JIRA Issue 44
Resolved JIRA 34