Issue 578: initial commit
Issue 578: code review changes
Merge pull request #796 from sanai56967/578

#796: pull request Issue 578: initial commit