Merge pull request #52 from sieverssj/master

Fixing FindBugs issues