Improve handling of undefined headers
New version: 0.5