Improved vtag parsing (from @cfr)
Extend test document
Ongoing 2.0 documentation