Issue 591: Updated initial commit
Issue 591: code review changes
Merge pull request #742 from sanai56967/591

#742: pull request Issue 591: Updated initial commit