Fix-for-issue-#530
Merge pull request #531 from gargsms/dev

Fix-for-issue-#530