Update #44 Use BufRead instead of silent new
Add better buffer support