Fix header issue

[closes #1]
[closes #2]