Merge pull request #267 from svost/headers