added equals and hashcode, completed object overall
Merge origin/master