diff --git a/SteamApi/User.php b/SteamApi/User.php
index 98fe849..0136d46 100644
--- a/SteamApi/User.php
+++ b/SteamApi/User.php
@@ -83,12 +83,18 @@ public function GetFriendList($relationship = 'all')
 
 		// Clean up the games
 		$steamIds = array();
+		$friends = array();
 
 		foreach ($client->friends as $friend) {
 			$steamIds[] = $friend->steamid;
+			if (count($steamIds) == 100) {
+				$friends = array_merge($friends, $this->GetPlayerSummaries(implode(',', $steamIds)));
+				$steamIds = array();
+			}
 		}
 
-		$friends = $this->GetPlayerSummaries(implode(',', $steamIds));
+		if (count($steamIds) > 0)
+			$friends = array_merge($friends, $this->GetPlayerSummaries(implode(',', $steamIds)));
 
 		return $friends;
 	}