Allow file name in argv.
Merge branch 'allow-filename-in-argv'