Partial Findbugs Warnings cleanup [#49]
Merge pull request #74 from wolczyk/findbugs

Partial Findbugs Warnings cleanup [#49]