--- a/src/rps.erl	Thu Mar 06 19:39:46 2014 +0900
+++ b/src/rps.erl	Sat Mar 08 15:36:49 2014 +0900
@@ -5,6 +5,7 @@
 
 -define(BOTS, [fool, copycat, gambler]).
 -define(RULES, rps5).
+-define(TIMETOJOIN, 10).
 
 go() ->
     rps_nickserv:start_link(),
@@ -16,17 +17,25 @@
     [spawn_link(rps_bots, Bot, []) || Bot <- ?BOTS].
 
 lobby() ->
-    lobby([]).
+    lobby([], ?TIMETOJOIN).
 
-lobby(Players) when length(Players) =:= length(?BOTS) ->
+lobby(Players, 0) ->
     Room = spawn_link(rps_room, room, [?RULES, Players]),
     lists:foreach(fun(Player) -> Player ! {room, Room, ?RULES} end, Players),
-    lobby([]);
+    lobby();
 
-lobby(Players) ->
+lobby(Players, Timeout) ->
+    Wait = case length(Players) of
+        0 -> infinity;
+        _ -> 1000
+    end,
     receive
         {join, Who} ->
-            lobby([Who|Players])
+            lobby([Who|Players], Timeout)
+    after
+        Wait ->
+            io:format("~w players joined, waiting ~w", [length(Players), Timeout]),
+            lobby(Players, Timeout - 1)
     end.
 
 counter() ->