Take spaces in folder names into account
Merge pull request #33 from holgersindbaek/master

Take spaces in folder names into account