Added space handling via conversion to dashes, closes #29
Fixed file removal, closes #33