addressed code analysis warnings
Merge pull request #18 from adamralph/code-analysis

addressed code analysis warnings