Fixes issue 7 and a file deletion bug

Fixes issue 7 and a bug with deleting files with spaces in the file name.