Add support for multiple teams with the same primary name

Change-Id: Ie70c29e16cbe41081fe13c1a1c0ae084cbef863f
Merge pull request #78 from Joe030984/master

Add support for multiple teams with the same primary name (issue #77)