Adding support for a more powerful tag format + a bug fix + documentation