Header padding bug fixed
Merge origin/master