Added support for spaces in paths