Extended list of addornments for headers added. Fixes #27