147 - header edit
Merge pull request #493 from gsn/master

147 - header edit