Merge pull request #89 from Korkman/master

Efficient multiline headers
Merge branch 'master' into customglobals2