Merge pull request #71 from Pro/master

Merge coverty scan changes from master