Thanks, I'd be happy to work on that and submit a PR against 3.0!

However, our company uses 2.x right now and I doubt we will upgrade anytime soon, so it would be really nice to also have this backported to 2.x. If that's not something you're willing to do, I totally understand, and we would likely just maintain a fork of our own until we're ready to switch to 3.x.