Merge branch 'ScannerFix'
Merge remote-tracking branch 'upstream/master'
BOLON fix
Merge pull request #33 from drpepper240/master

BOLON fix