Improved recognition of local files as command line argument
Merge branch 'local_file' into featuremerge