sync to latest spec, fixes #29