Streams are now much more safe
Merge remote-tracking branch 'origin/master'