findbugs fixes for library
Merge pull request #355 from glee23/master

Library Findbugs fixes