Fix following FindBugs analysis
Prepare next version
Next findbugs fix
Fix after upgrade and issues from FindBugs
Merge pull request #4 from fredericBregier/master

Fix following FindBugs analysis and Upgrade