Added support for files with spaces in path.