Bugfix: Spaces in directory and file names.