Resolves #5 : Optional headers