Support for dirs with special chars (closes #3617)
Merge pull request #1 from eguaj/master

Support for dirs with special chars (closes #3617)