Merge pull request #1710 from gennadiycivil/master

Formatting Changes and small code merge