Merge pull request #367 from jpecht/master

header/font styling
Merge remote-tracking branch 'upstream/master'