Header improvements
Merge
Merge pull request #4 from martindido/feature/header-improvements

Feature/header improvements