Pinwheel update header fixes.
Merge branch 'master' into pinwheel-updates
Merge pull request #84 from kreeger/pinwheel-updates

Pinwheel updates