(fix) Added respect for whitespace in DIR and CMD
Merge pull request #1 from reem/master

(fix) Added respect for whitespace in DIR and CMD