scan_files
Merge branch 'master' into gh-pages
scan_files