Allow directory names to contain spaces.
Merge pull request #563 from jgeusebroek/master

Allow directory names to contain spaces