Merge pull request #467 from thotypous/master

Fix dealing with filenames containing spaces