Added support for spaces in directory