Add support for annotated tags, max number of lines, bug fixes.