Added -d option to specify delimeter, overriding defaults