Correctly merge default headers with request provided headers - fixes #255
Merge pull request #270 from mauricio/issue-256

Correctly merge default headers with request provided headers - fixes #255