Added hash fun option.
Merge branch 'test' into dev