Update that allows for spaces in arguments

Ran into an issue with data-dir being defined with a space in the path.