Merge pull request #1 from esimons/plus-hash-support

Plus hash support
Merge remote-tracking branch 'origin/master' into plus-hash-support