Adds support for RFC 4180