Extra headers support

Fix #72