This is in production now (v1.0.0)