(fix) Added respect for whitespace in DIR and CMD