Add support of file names including spaces.