Better handling of delimiter option and default.