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

Reinstate scan.
Whitespace
Re-enable concatV test.
Merge pull request #139 from pjonsson/enable-concatv-test

Re-enable concatV test.