Bug fix: Folders with spaces and parens supported

Pushing at 7:55am before work start.