stringstream  manip and client
Merging release into master.