New version compatible with draft 1.5