Merge pull request #1 from dwoffinden/master

headers and shizz