Merge pull request #166 from rogerhu/hash_string

Hash by String ID, not by User.
Include client in the data too.