findbugs fixes
Merge pull request #30 from uhtu/master

findbugs fixes