Rfc6810 bis

pull request for reviewing code
Done: 0d8268e80b7755f5c24935fd2b1723df0a3d7ed9