added hashing
Merge branches 'master' and 'current'