Unique ClientID [#78]
merging changes from trunk
Work in progress [#69] and [#73]
branching library to branches/i-campbell