add a test for hash
Merge remote-tracking branch 'origin/master'