scanner version 1
Merge branch 'scanner'