Merge pull request #15 from JayBeavers/master

Cleanup of issues found by static analysis tooling