Please merge these in, Arthur.

On Sun, Sep 1, 2019 at 7:34 PM Shiro Kawai <xxxxxx@gmail.com> wrote:

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