Fixes #29 - fixes issue with date formatting and null headers