Changed processing of stream
0.2.5