Fixes #447
Merge pull request #452 from FileTrek/grid-header

Fixes #447