Added support for RFC 288
Got in a muddle