fix to jira APPM-155
Merge pull request #92 from lahiru823/master

fix to jira APPM-155