Merge pull request #1732 from gennadiycivil/master

comment cleanup