Add ability to have separate annotation headings

Fixes #13