Sync to master, allow commandline file