Streams2

Small patch to fix the warnings on 0.10 mentioned in issue #95
Backward compatible: tested build, new, preview manually on 0.10.2 & 0.8.22