follow header conventions,

where it doesn't conflict with outshine improvements.
Merge pull request #2 from tarsius/master

follow header conventions,