Added Support for Directory with Spaces in Name