Handle paths with spaces in them

Handle paths with spaces in them