Merge pull request #1724 from gennadiycivil/master

 formatting and small changes related to code management