I removed the commit which include FindBugs fixes from this PR and 
created new PR #230 (rebased on current master).