Improved headers
Merge pull request #244 from fabienrohrer/master

Improved headers