Updates from Sloane
Merge pull request #8 from DinnerMode/f-nohash

Updates from Sloane