Changes to make to handle directories with spaces

May break Linux/Mac ports