diff --git a/src/main/java/info/istlab/IoTP/App.java b/src/main/java/info/istlab/IoTP/App.java
index 92b828d..9072f0c 100644
--- a/src/main/java/info/istlab/IoTP/App.java
+++ b/src/main/java/info/istlab/IoTP/App.java
@@ -31,9 +31,13 @@
     public static String latestVersion;
     public static Path execPath;
     public static String downloadurl = "https://cit.istlab.info/IoTP/target/";
+    public static boolean isWindows;
+    public static String serialName;
 
     static {
         userhome = System.getProperty("user.home");
+        String os = System.getProperty("os.name").toLowerCase();
+        isWindows = os.contains("windows");
     }
 
     public static void main(String[] args) {
diff --git a/src/main/java/info/istlab/IoTP/ScriptRunner.java b/src/main/java/info/istlab/IoTP/ScriptRunner.java
index 434d060..921040d 100644
--- a/src/main/java/info/istlab/IoTP/ScriptRunner.java
+++ b/src/main/java/info/istlab/IoTP/ScriptRunner.java
@@ -43,29 +43,32 @@
         // Run script
         // System.out.println(scriptfile);
         ArrayList<String> comlist = new ArrayList<String>();
-        comlist.add("cmd");
-        comlist.add("/c");
-        comlist.add("start");
-        // comlist.add("C:\\Program files\\Git\\bin\\git-bash.exe");
-        // comlist.add("-c");
-        comlist.add("Upload.bat");
-        if (srcfile.length()>0) comlist.add(srcfile);
-        comlist.add("COM3");
-
-        // comlist.add("bash");
-        // comlist.add("Upload.sh");
-        // if (srcfile.length()>0) comlist.add(srcfile);
+        if (App.isWindows) {
+            comlist.add("cmd");
+            comlist.add("/c");
+            comlist.add("start");
+            comlist.add("Upload.bat");
+            if (srcfile.length() > 0)
+                comlist.add(srcfile);
+            comlist.add(App.serialName);
+        } else {
+            comlist.add("bash");
+            comlist.add("Upload.sh");
+            if (srcfile.length() > 0)
+                comlist.add(srcfile);
+        }
 
         ProcessBuilder processBuilder = new ProcessBuilder(comlist);
         // ProcessBuilder processBuilder = new ProcessBuilder("pwd");
         processBuilder.directory(new File(App.workingDir));
         // System.out.println(App.workingDir);
         // processBuilder.inheritIO();
-        JTAConsole con = new JTAConsole("(Exec) " + scriptfile+ " "+srcfile);
+        JTAConsole con = new JTAConsole("(Exec) " + scriptfile + " " + srcfile);
         // con.setMainSrcByFileName(scriptfile);
         con.Systemoutprintln("=== 実行開始 ===");
-        // con.Systemoutprintln(CommandRunner.prompt+"cd ~" + App.nwpsrc+"    (注：~ はチルダ記号〜 で，ホームディレクトリを表します)");
-        for(String s: comlist){
+        // con.Systemoutprintln(CommandRunner.prompt+"cd ~" + App.nwpsrc+" (注：~ はチルダ記号〜
+        // で，ホームディレクトリを表します)");
+        for (String s : comlist) {
             con.Systemoutprintln(s);
         }
         Map<String, String> envs = processBuilder.environment();
@@ -91,6 +94,9 @@
         thread = null;
         // runB.setText("Run");
         SerialWindow.invoke();
+        if (App.isWindows) {
+            con.frame.dispose();
+        }
     }
 
 }