Trecouvr/dispatch custom headers

Depends on #18