add support for headers as per design doc
Merge pull request #5 from mferrier/headers

add support for headers as per design doc