merged changes
Merge pull request #9 from avneev/feature/header

merged changes