Add custom header support, fixes #22