Fix header styles
Merge branch 'master' into header_markup_continue
Add address style
Fix address style
Resolve merge conflict
Merge pull request #56 from dmitryshilin/header_markup_continue

Header markup done