Streams2

Merging streams2 version to master