Issue 532: initial commit
Issue 532: code review and merge changes
Merge pull request #648 from sanai56967/532

#648: pull request Issue 532: initial commit