Fixed issue with header weight and extra space.
Merge remote-tracking branch 'origin/master'