Fix findbugs errors.
Merge pull request #2 from m1ch1/master

Fix findbugs errors.