#272 addressed code analysis violations
Merge pull request #291 from adamralph/272

#272 addressed code analysis violations