making it faster
Merge remote-tracking branch 'GITHUB/master'
fxing the line scanning