Added support for path with spaces