removed buffered reader
Merge remote-tracking branch 'origin/master'