change space in el-scan filenames to underscore
Merge branch 'master' into CAPER