Merging edits to allow tar balls with @ in them