Merge pull request #1704 from gennadiycivil/master

small cleanup, np functional changes