Extra headers support

Fix #72
Merge pull request #75 from Spomky/ExtraHeaders

Extra headers support