Merge pull request #529 from peternewman/coverity_scan

Coverity scan
Merge pull request #530 from peternewman/coverity_scan

Fix the email
Alt email