Issue #101 Removed puzzle, added @EqualsAndHashCodeOf annotation