merge in progress
modified:   scan.cpp: add usage line from master branch.