--- a/ie-docker.c	Mon Nov 17 09:13:36 2014 +0900
+++ b/ie-docker.c	Mon Nov 17 11:49:43 2014 +0900
@@ -197,14 +197,13 @@
     printf("\tdettach: dettach process\n");
     printf("\timages: list images\n");
     printf("\tcommit: \n");
-    printf("\tps-name should be students_e11_e115711_01 or teachers_kono_02\n");
 }
 
 void
 run_usage()
 {
     printf("Usage:\tie-docker run\n");
-    printf("\tie-docker [option] --name e145701_[process_name] {image name}:{tag} [execute command] [argument]");
+    printf("\tie-docker [option] --name [process_name] {image name}:{tag} [execute command] [argument]");
 }
 
 /* main(int argc, char **argv) - main process loop */
@@ -253,7 +252,12 @@
     char *ps_name = (char *)malloc(sizeof(char) * PS_NAME_LENGTH);
     ps_name[0] = '\0';
     if (strncmp(argv[1], "ps", 4) != 0) {
-        make_ps_name(ps_name, account_type, name, argv[4]);
+        if (strncmp(argv[1], "run", 3) == 0) {
+            make_ps_name(ps_name, account_type, name, argv[4]);
+        } else {
+            make_ps_name(ps_name, account_type, name, argv[2]);
+        }
+        printf("%s", ps_name);
     }
 
     if (argc >= 3) {
@@ -302,6 +306,10 @@
         if (execl(command, command, dettach_command, argv[2], NULL) < 0) {
             perror("Execl:");
         }
+    } else if ( strncmp(argv[1], rm_command, 2) == 0 ) {
+        if (execl(command, command, rm_command, ps_name, NULL) < 0) {
+            perror("Execl:");
+        }
     } else {
         usage();
         exit(1);