Additional Context Handlers

Dear James,

two days ago I've written you a long letter describing the case making this feature quite needed. Today, I'm glad to send you this pull request w/ its implementation and tests. Hope you'll find this code good enough to merge. 

Regards,
Michael