Support whitespaces in folders, fix #1