Merge remote-tracking branch 'origin/development'
Use value['name'] for the header name rather than the numerical key
Merge remote-tracking branch 'upstream/master' into fix_headers
Merge pull request #11 from lucascaro/fix_headers

Fix headers