Correctly handle headers that should only have one value, fixes #5