fix findbugs warnings
bugfix: undo new equals method implementation
Merge pull request #201 from dennishendriksen/testing

Fix FindBugs warnings + revert fix