Merge pull request #3 from CarlosPlusPlus/header-redesign

Header redesign