Second commit
Fixed findBug issues