Perserve the original filename and path

Funny - they're different users, asking very similar things very close together. You guys work together - LOL?

@gbadesha: Take a look at the reply to kbmcdonald's similar question here...?