Added support for RFC4731