Add support for short headers - disabled by default.

Fixes #8