Merge pull request #376 from Pylons/bugfix/header-calculation

Bugfix: header calculation