Reinstate scan.
Merge pull request #88 from pjonsson/fix-scan

Reinstate scan.