Pull in latest from eligrey

So that the NPM package is up to date, pulling in the latest from the upstream fork.