Fix JIRA #LRA-124 issues and other minor updates
Merge pull request #6 from raghuveerk/master

Fix JIRA #LRA-124 issues and other minor updates