suggest some fixes/improvements
Merge pull request #162 from hanoii/master

* Hashes modification suggest some fixes/improvements.