Create a clean branch and only cherry picked the code.

Hey @chriswarren,

I created a new clean branch and cherry picked the code for the two features:

- support for groups
- support for max_requests

Both features are separate commits so you can choose if and how to add them.

Cheers
Thomas