Fixed hash madness.
Merge remote-tracking branch 'origin/master'
Removed David’s crap