Merge pull request #220 from heiseda/master

Hash code fixes and improvements