Merge pull request #219 from heiseda/master

Speed ups based on hashing