Fixed some issues.
Merge pull request #20 from jslvtr/headers_fix

Fixed some issues.