Merge pull request #1 from worg/master

http.Header support for message
sync with upstream