cleaned up equals() method
modified equals() method
Merge remote-tracking branch 'origin/master'