#257 bug - slow scanner
Merge pull request #258 from lucastschmidt/master

#257 bug - slow scanner

Fixes #257