header minor fix
fix merge conflicts
Merge pull request #38 from sarahgosago/v1.0.0/1950

header minor fix