Bug fix: secondary problems with spaces in directory names fixed.