Fixed problems with filenames containing a space.