fixed working with stream library 0.04
fixed issues with return statement