Ddstream 178

pr #178 + minor additions