Added quoting for filenames with spaces