Refactored methods in Scanner and PeekBackReader
Merge remote-tracking branch 'origin/master'
Did stuff
Did stuff