I'll merge the PR and make the changes myself.