Added column labels for TAGS 5.0.
Merge branch 'master' into gh-pages