Added more missing tags
Merge remote-tracking branch 'bartonp/master'