follow header conventions more closely
Merge pull request #2 from tarsius/master

follow header conventions more closely