Pushed to master since it's been 2 weeks, and I'm pretty confident this
package works.

Cheers!