addresses #363 - temporary fix, but this will require more thought later, as custom headers require a subclass
Merge pull request #364 from bshaffer/quick-fix-for-363

addresses #363 - temporary fix, but this will require more thought later...