Rfc6810 bis

pull request for reviewing code
Done 101f3ea876597c9fc402f9941ecfd2f226409acf