pythonthings
diff --git a/‎github3/events.py
+3-2 b/‎github3/events.py
+3-2
diff --git a/‎github3/github.py
+23-6 b/‎github3/github.py
+23-6
@@ -266,10 +266,10 @@ def _release(payload, session):
 
 
 def _team(payload, session):
-    from .orgs import Team
+    from .orgs import ShortTeam
     from .repos import ShortRepository
     if payload.get('team'):
-        payload['team'] = Team(payload['team'], session)
+        payload['team'] = ShortTeam(payload['team'], session)
     if payload.get('repo'):
         payload['repo'] = ShortRepository(payload['repo'], session)
     if payload.get('sender'):
@@ -278,6 +278,7 @@ def _team(payload, session):
 
 
 def identity(x, session):
+    """Return the value."""
     return x
 
 
 
@@ -17,13 +17,14 @@
 from . import gists
 from .issues import ShortIssue, Issue, issue_params
 from .models import GitHubCore
-from .orgs import Membership, ShortOrganization, Organization, Team
+from .orgs import Membership, ShortOrganization, Organization
 from .projects import Project, ProjectCard, ProjectColumn
 from .pulls import PullRequest
 from .repos import repo
 from .search import (CodeSearchResult, IssueSearchResult,
                      RepositorySearchResult, UserSearchResult)
 from .structs import SearchIterator
+from . import orgs
 from . import users
 from .notifications import Thread
 from .licenses import License
@@ -828,9 +829,22 @@ def me(self):
 
     @requires_auth
     def membership_in(self, organization):
-        """Retrieve the user's membership in the specified organization."""
-        url = self._build_url('user', 'memberships', 'orgs',
-                              str(organization))
+        """Retrieve the user's membership in the specified organization.
+
+        :param organization:
+            the organization or organization login to retrieve the authorized
+            user's membership in
+        :type organization:
+            str
+        :type organization:
+            :class:`~github3.orgs.Organization`
+        :returns:
+            the user's membership
+        :rtype:
+            :class:`~github3.orgs.Membership`
+        """
+        organization_name = getattr(organization, 'login', organization)
+        url = self._build_url('user', 'memberships', 'orgs', organization_name)
         json = self._json(self._get(url), 200)
         return self._instance_or_null(Membership, json)
 
@@ -1708,10 +1722,13 @@ def user_teams(self, number=-1, etag=None):
         authenticated user belongs. This method requires user or repo scope
         when authenticating via OAuth.
 
-        :returns: generator of :class:`Team <github3.orgs.Team>` objects
+        :returns:
+            generator of teams
+        :rtype:
+            :class:`~github3.orgs.ShortTeam`
         """
         url = self._build_url('user', 'teams')
-        return self._iter(int(number), url, Team, etag=etag)
+        return self._iter(int(number), url, orgs.ShortTeam, etag=etag)
 
     def user_with_id(self, number):
         """Get the user's information with id ``number``.