Deal with directories containing spaces. This fixes issue #259