Organize header
Merge branch 'master' into validation