diff --git a/Octokit/Clients/IOrganizationMembersClient.cs b/Octokit/Clients/IOrganizationMembersClient.cs
index 3ac23eb7..860fa7c9 100644
--- a/Octokit/Clients/IOrganizationMembersClient.cs
+++ b/Octokit/Clients/IOrganizationMembersClient.cs
@@ -30,9 +30,32 @@ namespace Octokit
         /// for more information.
         /// </remarks>
         /// <param name="org">The login for the organization</param>
-        /// <returns></returns>
+        /// <returns>The users</returns>
         Task<IReadOnlyList<User>> GetAll(string org);
 
+        /// <summary>
+        /// <para>
+        /// List all users who are members of an organization. A member is a user that
+        /// belongs to at least 1 team in the organization.
+        /// </para>
+        /// <para>
+        /// If the authenticated user is also an owner of this organization then both
+        /// concealed and public member will be returned.
+        /// </para>
+        /// <para>
+        /// If the requester is not an owner of the organization the query will be redirected
+        /// to the public members list.
+        /// </para>
+        /// </summary>
+        /// <remarks>
+        /// See the <a href="http://developer.github.com/v3/orgs/members/#members-list">API documentation</a>
+        /// for more information.
+        /// </remarks>
+        /// <param name="org">The login for the organization</param>
+        /// <param name="filter">The filter to use when getting the users</param>
+        /// <returns>The users</returns>
+        Task<IReadOnlyList<User>> GetAll(string org, string filter);
+
         /// <summary>
         /// List all users who have publicized their membership of the organization.
         /// </summary>
diff --git a/Octokit/Clients/ITeamsClient.cs b/Octokit/Clients/ITeamsClient.cs
index 8b9a11b7..1637b421 100644
--- a/Octokit/Clients/ITeamsClient.cs
+++ b/Octokit/Clients/ITeamsClient.cs
@@ -72,5 +72,40 @@ namespace Octokit
         /// <param name="login">The user to check.</param>
         /// <returns><see langword="true"/> if the user is a member of the team; <see langword="false"/> otherwise.</returns>
         Task<bool> IsMember(int id, string login);
+
+        /// <summary>
+        /// Add a member to the team
+        /// </summary>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns></returns>
+        Task AddMember(int id, string login);
+
+        /// <summary>
+        /// Remove a member from the team
+        /// </summary>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns></returns>
+        Task RemoveMember(int id, string login);
+
+        /// <summary>
+        /// Returns all team's repositories.
+        /// </summary>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns>The team's repositories</returns>
+        Task<IReadOnlyList<Repository>> GetRepositories(int id);
+
+        /// <summary>
+        /// Add a repository to the team
+        /// </summary>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns></returns>
+        Task AddRepository(int teamId, string organization, string repoName);
+
+        /// <summary>
+        /// Remove a repository from the team
+        /// </summary>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns></returns>
+        Task RemoveRepository(int teamId, string organization, string repoName);
     }
 }
diff --git a/Octokit/Clients/OrganizationMembersClient.cs b/Octokit/Clients/OrganizationMembersClient.cs
index 0c892066..15149d20 100644
--- a/Octokit/Clients/OrganizationMembersClient.cs
+++ b/Octokit/Clients/OrganizationMembersClient.cs
@@ -39,7 +39,7 @@ namespace Octokit
         /// for more information.
         /// </remarks>
         /// <param name="org">The login for the organization</param>
-        /// <returns></returns>
+        /// <returns>The users</returns>
         public Task<IReadOnlyList<User>> GetAll(string org)
         {
             Ensure.ArgumentNotNullOrEmptyString(org, "org");
@@ -47,6 +47,35 @@ namespace Octokit
             return ApiConnection.GetAll<User>(ApiUrls.Members(org));
         }
 
+        /// <summary>
+        /// <para>
+        /// List all users who are members of an organization. A member is a user that
+        /// belongs to at least 1 team in the organization.
+        /// </para>
+        /// <para>
+        /// If the authenticated user is also an owner of this organization then both
+        /// concealed and public member will be returned.
+        /// </para>
+        /// <para>
+        /// If the requester is not an owner of the organization the query will be redirected
+        /// to the public members list.
+        /// </para>
+        /// </summary>
+        /// <remarks>
+        /// See the <a href="http://developer.github.com/v3/orgs/members/#members-list">API documentation</a>
+        /// for more information.
+        /// </remarks>
+        /// <param name="org">The login for the organization</param>
+        /// <param name="filter">The filter to use when getting the users</param>
+        /// <returns>The users</returns>
+        public Task<IReadOnlyList<User>> GetAll(string org, string filter)
+        {
+            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(filter, "filter");
+
+            return ApiConnection.GetAll<User>(ApiUrls.Members(org, filter));
+        }
+
         /// <summary>
         /// List all users who have publicized their membership of the organization.
         /// </summary>
diff --git a/Octokit/Clients/TeamsClient.cs b/Octokit/Clients/TeamsClient.cs
index 8b7b9d93..31529faf 100644
--- a/Octokit/Clients/TeamsClient.cs
+++ b/Octokit/Clients/TeamsClient.cs
@@ -128,5 +128,65 @@ namespace Octokit
                 return false;
             }
         }
+
+        /// <summary>
+        /// Add a member to the team
+        /// </summary>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns></returns>
+        public Task AddMember(int id, string login)
+        {
+            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+
+            var endpoint = ApiUrls.TeamMember(id, login);
+            return ApiConnection.Connection.Put(endpoint);
+        }
+
+        /// <summary>
+        /// Remove a member from the team
+        /// </summary>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns></returns>
+        public Task RemoveMember(int id, string login)
+        {
+            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+
+            var endpoint = ApiUrls.TeamMember(id, login);
+            return ApiConnection.Delete(endpoint);
+        }
+
+        /// <summary>
+        /// Returns all team's repositories.
+        /// </summary>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns>The team's repositories</returns>
+        public Task<IReadOnlyList<Repository>> GetRepositories(int id)
+        {
+            var endpoint = ApiUrls.TeamRepositories(id);
+
+            return ApiConnection.GetAll<Repository>(endpoint);
+        }
+
+        /// <summary>
+        /// Add a repository to the team
+        /// </summary>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns></returns>
+        public Task AddRepository(int teamId, string organization, string repoName)
+        {
+            var endpoint = ApiUrls.TeamRepository(teamId, organization, repoName);
+            return ApiConnection.Put(endpoint);
+        }
+
+        /// <summary>
+        /// Remove a repository from the team
+        /// </summary>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns></returns>
+        public Task RemoveRepository(int teamId, string organization, string repoName)
+        {
+            var endpoint = ApiUrls.TeamRepository(teamId, organization, repoName);
+            return ApiConnection.Delete(endpoint);
+        }
     }
 }
diff --git a/Octokit/Helpers/ApiUrls.cs b/Octokit/Helpers/ApiUrls.cs
index 925f40f1..1444ef22 100644
--- a/Octokit/Helpers/ApiUrls.cs
+++ b/Octokit/Helpers/ApiUrls.cs
@@ -332,6 +332,16 @@ namespace Octokit
             return "orgs/{0}/members".FormatUri(org);
         }
 
+        /// <summary>
+        /// Returns the <see cref="Uri"/> that returns all of the members of the organization
+        /// </summary>
+        /// <param name="org">The organization</param>
+        /// <returns></returns>
+        public static Uri Members(string org, string filter)
+        {
+            return "orgs/{0}/members?filter={1}".FormatUri(org, filter);
+        }
+
         /// <summary>
         /// Returns the <see cref="Uri"/> that returns all of the public members of the organization
         /// </summary>
@@ -988,6 +998,26 @@ namespace Octokit
             return "teams/{0}/members".FormatUri(id);
         }
 
+        /// <summary>
+        /// returns the <see cref="Uri"/> for the repositories
+        /// </summary>
+        /// <param name="id">The team id</param>
+        public static Uri TeamRepositories(int id)
+        {
+            return "teams/{0}/repos/".FormatUri(id);
+        }
+
+        /// <summary>
+        /// returns the <see cref="Uri"/> for a team repository
+        /// </summary>
+        /// <param name="id">The team id</param>
+        /// <param name="organization">The organization id</param>
+        /// <param name="repoName">The repository name</param>
+        public static Uri TeamRepository(int id, string organization, string repoName)
+        {
+            return "teams/{0}/repos/{1}/{2}".FormatUri(id, organization, repoName);
+        }
+
         /// <summary>
         /// returns the <see cref="Uri"/> for teams
         /// use for update or deleting a team