Rfc6810 bis

pull request for reviewing code
here also :)