fixed header issue
Merge branch 'issue1', remote-tracking branch 'origin'