header modified etc
Merge pull request #772 from luixxiul/development

header modified etc