Rfc6810 bis

pull request for reviewing code
create a goto label here