Findbug fixes
Merge pull request #82 from Bonder-MJ/master

Findbug fixes