Merge pull request #71 from Pro/master

Merge coverty scan changes from master
Merge pull request #72 from Pro/coverty_scan

Merge pull request #71 from Pro/master