equals&hashcodes
Merge origin/master