Fix issue with spaces in folder names.
Merge pull request #118 from dubcanada/master

Fix issue with spaces in folder names.