diff --git a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
index 4309c0b..bd5bdb3 100644
--- a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
@@ -131,7 +131,6 @@
         Button FinishGuessButton = (Button) findViewById(R.id.finishGuessButton);
         FinishGuessButton.setEnabled(false);
         //FinishGuessButton.setColorFilter(0xaaCCCCCC);
-
     }
 
     private void buttonProcesses(){
@@ -158,6 +157,10 @@
                 if(HintMax.getText().toString().length() != 0){
                     System.out.println("Gakuto:MasterActivity ヒントマックス" + HintMax.getText().toString());
                     hintMax = Integer.parseInt(HintMax.getText().toString());
+                    //マックス０は受け付けない
+                    if(hintMax == 0){
+                        hintMax = 1;
+                    }
                 }
 
 
diff --git a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
index 318fa43..90157cc 100644
--- a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
+++ b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
@@ -12,6 +12,7 @@
 import android.widget.ListView;
 import android.widget.TextView;
 import android.view.Gravity;
+import org.ntlab.irisclient.models.Member;
 
 import org.ntlab.irisclient.models.Member;
 
@@ -36,29 +37,34 @@
         //irisからプレイヤーの一覧を取得
         Iris iris = (Iris)this.getActivity().getApplication();
 
-        //test
-        if(iris == null){
-            System.out.println("通信失敗:Gakuto Game GamePlayerListFragment irisが取得できていません");
-        }
-
         List<Member> players = iris.getMemberList();
+        List<Member> myTeamPlayers = new ArrayList<>();
 
-        //memberのリストから名前(string)だけを抽出
+        //プレイヤーのリストから名前(string)だけを抽出
         ArrayList<String> viewPlayers = new ArrayList<>();
 
+        //自分と同じチームのだけと抽出。スパイマスターはトップにくるようにしています。
         players.forEach(m -> {
 
             if(m.getBelongs().equals(myTeam)){
-                viewPlayers.add(m.getNickname());
+                if(m.getMaster() == true){
+                    viewPlayers.add(0,m.getNickname());
+                    myTeamPlayers.add(0,m);
+                }else{
+                    viewPlayers.add(m.getNickname());
+                    myTeamPlayers.add(m);
+                }
+
             }
         });
 
-
+        System.out.println("Gakuto:GamePLayerList" + players.get(0).getNickname() + players.get(1).getNickname() );
 
         ListView playersList = (ListView) view.findViewById(R.id.PlayersList);
 
-        BaseAdapter adapter = new MemberListAdapter(this.getActivity().getApplicationContext(), R.layout.member_list_layout, viewPlayers, players);
+        //BaseAdapter adapter = new MemberListAdapter(this.getActivity().getApplicationContext(), R.layout.member_list_layout, viewPlayers, players);
        // BaseAdapter adapter = new MemberListAdapter(this.getActivity().getApplicationContext(), R.layout.fragment_game_player_list, viewPlayers, players);
+        BaseAdapter adapter = new MemberListAdapter(this.getActivity().getApplicationContext(), R.layout.member_list_layout, viewPlayers, myTeamPlayers);
         playersList.setAdapter(adapter);
 
         return view;
diff --git a/app/src/main/res/layout/activity_game_master.xml b/app/src/main/res/layout/activity_game_master.xml
index 127eaa2..b4200f3 100644
--- a/app/src/main/res/layout/activity_game_master.xml
+++ b/app/src/main/res/layout/activity_game_master.xml
@@ -68,6 +68,7 @@
         android:hint="数"
         android:inputType="number"
         android:maxLength="1"
+        android:imeOptions="actionDone"
         app:layout_constraintBottom_toTopOf="@+id/include"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"