Configurable message headings
Merge headings from master
v0.1.20
Merge with v0.1