Fix hashing
Merge branch 'master' into forked_stuff
fixed gem