lergo-174 : Header improvments
lergo-197
lergo-174 : review comments
Merge pull request #84 from lergo/lergo-174

Lergo 174