Adding support for CR tokens (rfc5234)