Merge pull request #2 from cli/master

Merge latest changes into coverity test branch