Fixes issue #1

Fixes the handling of "+" in file names