diff --git a/src/main/java/com/ntlab/irisserver/entities/Room.java b/src/main/java/com/ntlab/irisserver/entities/Room.java
index 95eb7d3..36f84f7 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Room.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Room.java
@@ -1,5 +1,6 @@
 package com.ntlab.irisserver.entities;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -19,13 +20,13 @@
 
         public List<Member> getMembers() {
 
-                //List<Member> memberslist =  members.values();
-                return null;
+                List<Member> memberslist = new ArrayList<Member>(members.values()) ;
+                return memberslist;
 
         }
 
         public Member getMember(String nick) {
-                Member m = new Member(nick);
+                Member m = members.get(nick);
                 return m;
         }
 
@@ -37,6 +38,6 @@
         public int StateRest(){
                 return 0;
         }
-        public void Room(String rid, String owner) {
+        public Room(String rid, String owner) {
         }
 }