Merge pull request #933 from am11/master

Code: Analysis warnings fixes