Added header support and tests
Merge pull request #4 from RWOverdijk/feature/headers

Added header support and tests