header refinements
Merge pull request #21 from avneev/feature/header-refinements

header refinements