Merge pull request #34 from williamjacksn/master

Fix scanner