Added support for spaces in filenames.