Issue 193: code review changes
Issue 193: further code review changes
Issue 193: small code review change
Merge pull request #699 from sanai56967/193

#699: pull request Issue 193: initial commit