diff --git a/static/js/components/app-main/index.js b/static/js/components/app-main/index.js
index 54e70d1..5078f08 100644
--- a/static/js/components/app-main/index.js
+++ b/static/js/components/app-main/index.js
@@ -112,7 +112,7 @@ module.exports = Vue.component('app-main', {
         '  \u001b[31mreturn\u001b[39m \u001b[37mhypernal\u001b[39m\u001b[90m;\u001b[39m',
         '\u001b[33m}\u001b[39m\u001b[90m;\u001b[39m',
         '2015-11-25T07:58:11.061Z'
-      ].join('\n');
+      ].join('\r\n');
 
       if (!runtime) {
         var xterm = new Terminal({
diff --git a/static/js/terminal/index.js b/static/js/terminal/index.js
index 42fdba9..d7bb6bf 100644
--- a/static/js/terminal/index.js
+++ b/static/js/terminal/index.js
@@ -56,7 +56,7 @@ function Terminal(options){
   options.handler = typeof options.handler === 'function' ? options.handler : function (){};
   this.handler = options.handler;
 
-  options.convertEol = options.convertEol !== false;
+  options.convertEol = options.convertEol === true;
   this.convertEol = options.convertEol;
 
   this.options = options;