calling extend should return self.

Signed-off-by: crynobone <crynobone@gmail.com>
small tweak to rename 'header' to 'headers'

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'