Added RFC 4180 functionality.