Fixes for header security
Merge pull request #286 from dshurt/master

Fixes for header security