added scrubber
Merge remote-tracking branch 'origin/master'
added scrubber, I am going to try a different method for the search, wish me luck!