diff --git a/bin/emulator.js b/bin/emulator.js
index 8c6ced5..8e33d7a 100644
--- a/bin/emulator.js
+++ b/bin/emulator.js
@@ -87,10 +87,14 @@ module.exports = {
               event.sender.send('emulator', type, project, data);
             };
 
-            var env = process.env;
+            var env = {};
+
+            Object.keys(process.env).forEach(function (key){
+              env[key] = process.env[key];
+            });
 
             project.env.forEach(function (item){
-              env[item.name] = item.value
+              env[item.name] = item.value;
             });
 
             emulator = new Emulator({
diff --git a/static/js/components/app-main/index.js b/static/js/components/app-main/index.js
index e0cea8f..2b68d9f 100644
--- a/static/js/components/app-main/index.js
+++ b/static/js/components/app-main/index.js
@@ -138,7 +138,7 @@ module.exports = Vue.component('app-main', {
       ipc.send('emulator', {
         name: this.project.name,
         path: this.project.path,
-        env: this.project.env,
+        env: util.normalize(this.project.env),
         command: {
           name: name,
           value: command
@@ -195,6 +195,7 @@ module.exports = Vue.component('app-main', {
     var step = 0;
 
     ipc.on('emulator', function (event, type, project, data){
+      var delay = step * 16;
       var runtime = window.AppRuntime[project.name];
 
       if (runtime) {
@@ -216,7 +217,7 @@ module.exports = Vue.component('app-main', {
         setTimeout(function (){
           runtime.xterm.write(data + '');
           scroll(runtime.xterm);
-        }, 10 * step);
+        }, delay);
       } else {
         event.sender.send('emulator', project, 'stop');
       }