Sent a couple of PRs that fixes reference implementation.  No change for the spec.