Add team info
Merge pull request #1384 from Superchicken/master

Add team info