Simplify stream reading logic
Version 0.2.3