diff --git a/IntegrationTest.py b/IntegrationTest.py
index 96c83192..4a98593d 100644
--- a/IntegrationTest.py
+++ b/IntegrationTest.py
@@ -174,6 +174,9 @@ class IntegrationTest:
         print o.login, "(", o.name, ")"
         print "  Members:", ", ".join( u.login for u in o.get_members() )
         print "  Repos:", ", ".join( r.name for r in o.get_repos() )
+        print "  Teams:"
+        for team in o.get_teams():
+            print "   ", team.name, "(" + team.permission + "):", ", ".join( u.login for u in team.get_members() ), "->", ", ".join( r.name for r in team.get_repos() )
         print
         sys.stdout.flush()
 
diff --git a/ReferenceOfClasses.md b/ReferenceOfClasses.md
index c1a56c17..930070fd 100644
--- a/ReferenceOfClasses.md
+++ b/ReferenceOfClasses.md
@@ -93,7 +93,7 @@ Members
 Teams
 -----
 * `get_teams()`: list of `Team`
-* `create_team( ... )`: `Team`: see [API](http://developer.github.com/v3/.../#...) for parameters (TODO SOON)
+* `create_team( ... )`: `Team`: see [API](http://developer.github.com/v3/orgs/teams/#create-team) for parameters
 
 Class `Repository`
 ==================
@@ -139,8 +139,8 @@ Teams
 
 Class `Team`
 ============
-* Attributes: see [API](http://developer.github.com/v3/.../#...) (TODO SOON)
-* `edit( ... )`: see [API](http://developer.github.com/v3/.../#...) for parameters (TODO SOON)
+* Attributes: see [API](http://developer.github.com/v3/orgs/teams/#get-team)
+* `edit( ... )`: see [API](http://developer.github.com/v3/orgs/teams/#edit-team) for parameters
 * `delete()`
 
 Members
diff --git a/github/GithubObjects.py b/github/GithubObjects.py
index 00bd0f15..283fc670 100644
--- a/github/GithubObjects.py
+++ b/github/GithubObjects.py
@@ -181,12 +181,12 @@ Organization._addAttributePolicy( MethodFromCallable( "create_fork", __createFor
 
 Team = GithubObject(
     "Team",
-    BaseUrl( lambda obj: "/teams/" + obj.id ),
-    Identity( lambda obj: obj.id ),
+    BaseUrl( lambda obj: "/teams/" + str( obj.id ) ),
+    Identity( lambda obj: str( obj.id ) ),
     BasicAttributes(
-        ### @todo
+        "url", "name", "id", "permission", "members_count", "repos_count",
     ),
-    Editable( [], [] ), ### @todo
+    Editable( [ "name" ], [ "permission" ] ),
     Deletable(),
     ListOfReferences( "members", NamedUser, addable = True, removable = True, hasable = True ),
     ListOfReferences( "repos", Repository, addable = True, removable = True, hasable = True ),