Merge pull request #2 from oaxlin/cleanup-header

jkjjkkl