Merge pull request #5 from daniel-kun/master

Updated from master
Merge pull request #6 from daniel-kun/coverity_scan

Merge pull request #5 from daniel-kun/master