Move addition of headers.
Merge pull request #4 from dkostenko/headers

Move addition of headers.