Merge pull request #280 from eustas/master

Fix headers