1. Fixed a bug missed where headers in the YAML file were not parsed.
2. Changed the YAML :headers: to use a hash instead of array.