Merge pull request #425 from msimerson/headers

Changes committed - thanks Matt.  Looks much better now.

BTW - when you fix up something we've commented on and you then think it's ready - can you make another comment on the request to that effect as Github doesn't send notifications when you add additional commits and it means that I'll notice quicker ;-)