Merge pull request #278 from svost/headers