Updated the header region
Refactored the code; fixes #24
Merge pull request #26 from cdog/bug-24

Updated the header region