Merge pull request #353 from wolfmanjm/cleanup/headers