added equals
Merged changes from myself