Line buffered won't work on some Windows(like ones in 258-lab)
Merge branch 'dev'