Reinstate scan.
Merge pull request #138 from pjonsson/reinstate-scan

Reinstate scan.