Fix JIRA #LRA-137
Merge pull request #2 from jkamcc/master

Fix JIRA #LRA-137