Allow spaces in project's pwd
Merge branch 'allow_spaces_in_pwd'