Add header handling
Closes #2