diff --git a/README.md b/README.md
index ce5e664..5e3f95a 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Or create any custom action!
 
 ## Browser Support
 
-* IE 9+
+* IE 9+ (theoretically, but good luck)
 * Chrome 5+
 * Firefox 4+
 * Safari 5+
@@ -235,7 +235,8 @@ const editor = init({
   classes: {
     actionbar: 'pell-actionbar-custom-name',
     button: 'pell-button-custom-name',
-    content: 'pell-content-custom-name'
+    content: 'pell-content-custom-name',
+    selected: 'pell-button-selected-custom-name'
   }
 })
 
diff --git a/demo.html b/demo.html
index 86f49f8..7ddb348 100644
--- a/demo.html
+++ b/demo.html
@@ -44,10 +44,6 @@ <h3>HTML output:</h3>
 
     <script src="dist/pell.js"></script>
     <script>
-      function ensureHTTP (str) {
-        return /^https?:\/\//.test(str) && str || `http://${str}`
-      }
-
       var editor = window.pell.init({
         element: document.getElementById('pell'),
         defaultParagraphSeparator: 'p',
diff --git a/dist/pell.js b/dist/pell.js
index 323afab..d9106cf 100644
--- a/dist/pell.js
+++ b/dist/pell.js
@@ -51,28 +51,28 @@ var actions = {
     icon: '<b>H<sub>1</sub></b>',
     title: 'Heading 1',
     result: function result() {
-      return exec('formatBlock', '<H1>');
+      return exec(formatBlock, '<h1>');
     }
   },
   heading2: {
     icon: '<b>H<sub>2</sub></b>',
     title: 'Heading 2',
     result: function result() {
-      return exec('formatBlock', '<H2>');
+      return exec(formatBlock, '<h2>');
     }
   },
   paragraph: {
     icon: '&#182;',
     title: 'Paragraph',
     result: function result() {
-      return exec('formatBlock', '<P>');
+      return exec(formatBlock, '<p>');
     }
   },
   quote: {
     icon: '&#8220; &#8221;',
     title: 'Quote',
     result: function result() {
-      return exec('formatBlock', '<BLOCKQUOTE>');
+      return exec(formatBlock, '<blockquote>');
     }
   },
   olist: {
@@ -93,7 +93,7 @@ var actions = {
     icon: '&lt;/&gt;',
     title: 'Code',
     result: function result() {
-      return exec('formatBlock', '<PRE>');
+      return exec(formatBlock, '<pre>');
     }
   },
   line: {
@@ -128,69 +128,98 @@ var classes = {
   selected: 'pell-button-selected'
 };
 
+var element = null;
+var defaultParagraphSeparator = null;
+
+var formatBlock = 'formatBlock';
+var addEventListener = function addEventListener(parent, type, listener) {
+  return parent.addEventListener(type, listener);
+};
+var appendChild = function appendChild(parent, child) {
+  return parent.appendChild(child);
+};
+var createElement = function createElement(tag) {
+  return document.createElement(tag);
+};
 var queryCommandState = function queryCommandState(command) {
   return document.queryCommandState(command);
 };
+var queryCommandValue = function queryCommandValue(command) {
+  return document.queryCommandValue(command);
+};
 
-var preventTab = function preventTab(event) {
-  if (event.which === 9) event.preventDefault();
+var handleKeyDown = function handleKeyDown(event, settings) {
+  if (event.which === 9) {
+    event.preventDefault();
+  } else if (event.which === 13 && queryCommandValue(formatBlock) === 'blockquote') {
+    setTimeout(function () {
+      return exec(formatBlock, '<' + defaultParagraphSeparator + '>');
+    }, 0);
+  }
 };
 
 var exec = function exec(command) {
   var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-
-  document.execCommand(command, false, value);
+  return document.execCommand(command, false, value);
 };
 
 var init = function init(settings) {
-  settings.actions = settings.actions ? settings.actions.map(function (action) {
+  element = settings.element;
+  defaultParagraphSeparator = settings.defaultParagraphSeparator || 'div';
+
+  actions = settings.actions ? settings.actions.map(function (action) {
     if (typeof action === 'string') return actions[action];else if (actions[action.name]) return _extends({}, actions[action.name], action);
     return action;
   }) : Object.keys(actions).map(function (action) {
     return actions[action];
   });
 
-  settings.classes = _extends({}, classes, settings.classes);
+  classes = _extends({}, classes, settings.classes);
 
-  var actionbar = document.createElement('div');
-  actionbar.className = settings.classes.actionbar;
-  settings.element.appendChild(actionbar);
+  var actionbar = createElement('div');
+  actionbar.className = classes.actionbar;
+  appendChild(element, actionbar);
 
-  settings.element.content = document.createElement('div');
-  settings.element.content.contentEditable = true;
-  settings.element.content.className = settings.classes.content;
-  settings.element.content.oninput = function (event) {
-    return settings.onChange(event.target.innerHTML);
+  var content = createElement('div');
+  content.contentEditable = true;
+  content.className = classes.content;
+  content.oninput = function (_ref) {
+    var firstChild = _ref.target.firstChild;
+
+    if (firstChild && firstChild.nodeType === 3) exec(formatBlock, '<' + defaultParagraphSeparator + '>');else if (content.innerHTML === '<br>') content.innerHTML = '';
+    settings.onChange(content.innerHTML);
+  };
+  content.onkeydown = function (event) {
+    return handleKeyDown(event, settings);
   };
-  settings.element.content.onkeydown = preventTab;
-  settings.element.appendChild(settings.element.content);
+  appendChild(element, content);
 
-  settings.actions.forEach(function (action) {
-    var button = document.createElement('button');
-    button.className = settings.classes.button;
+  actions.forEach(function (action) {
+    var button = createElement('button');
+    button.className = classes.button;
     button.innerHTML = action.icon;
     button.title = action.title;
     button.setAttribute('type', 'button');
     button.onclick = function () {
-      return action.result() || settings.element.content.focus();
+      return action.result() || content.focus();
     };
 
     if (action.state) {
       var handler = function handler() {
-        return button.classList[action.state() ? 'add' : 'remove'](settings.classes.selected);
+        return button.classList[action.state() ? 'add' : 'remove'](classes.selected);
       };
-      settings.element.content.addEventListener('keyup', handler);
-      settings.element.content.addEventListener('mouseup', handler);
-      button.addEventListener('click', handler);
+      addEventListener(content, 'keyup', handler);
+      addEventListener(content, 'mouseup', handler);
+      addEventListener(button, 'click', handler);
     }
 
-    actionbar.appendChild(button);
+    appendChild(actionbar, button);
   });
 
-  if (settings.defaultParagraphSeparator) exec('defaultParagraphSeparator', settings.defaultParagraphSeparator);
+  if (defaultParagraphSeparator) exec('defaultParagraphSeparator', defaultParagraphSeparator);
   if (settings.styleWithCSS) exec('styleWithCSS');
 
-  return settings.element;
+  return element;
 };
 
 var pell = { exec: exec, init: init };
diff --git a/dist/pell.min.js b/dist/pell.min.js
index a21afee..a249331 100644
--- a/dist/pell.min.js
+++ b/dist/pell.min.js
@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.pell={})}(this,function(t){"use strict";var e=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t},n={bold:{icon:"<b>B</b>",title:"Bold",state:function(){return i("bold")},result:function(){return l("bold")}},italic:{icon:"<i>I</i>",title:"Italic",state:function(){return i("italic")},result:function(){return l("italic")}},underline:{icon:"<u>U</u>",title:"Underline",state:function(){return i("underline")},result:function(){return l("underline")}},strikethrough:{icon:"<strike>S</strike>",title:"Strike-through",state:function(){return i("strikeThrough")},result:function(){return l("strikeThrough")}},heading1:{icon:"<b>H<sub>1</sub></b>",title:"Heading 1",result:function(){return l("formatBlock","<H1>")}},heading2:{icon:"<b>H<sub>2</sub></b>",title:"Heading 2",result:function(){return l("formatBlock","<H2>")}},paragraph:{icon:"&#182;",title:"Paragraph",result:function(){return l("formatBlock","<P>")}},quote:{icon:"&#8220; &#8221;",title:"Quote",result:function(){return l("formatBlock","<BLOCKQUOTE>")}},olist:{icon:"&#35;",title:"Ordered List",result:function(){return l("insertOrderedList")}},ulist:{icon:"&#8226;",title:"Unordered List",result:function(){return l("insertUnorderedList")}},code:{icon:"&lt;/&gt;",title:"Code",result:function(){return l("formatBlock","<PRE>")}},line:{icon:"&#8213;",title:"Horizontal Line",result:function(){return l("insertHorizontalRule")}},link:{icon:"&#128279;",title:"Link",result:function(){var t=window.prompt("Enter the link URL");t&&l("createLink",t)}},image:{icon:"&#128247;",title:"Image",result:function(){var t=window.prompt("Enter the image URL");t&&l("insertImage",t)}}},r={actionbar:"pell-actionbar",button:"pell-button",content:"pell-content",selected:"pell-button-selected"},i=function(t){return document.queryCommandState(t)},o=function(t){9===t.which&&t.preventDefault()},l=function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null;document.execCommand(t,!1,e)},u=function(t){t.actions=t.actions?t.actions.map(function(t){return"string"==typeof t?n[t]:n[t.name]?e({},n[t.name],t):t}):Object.keys(n).map(function(t){return n[t]}),t.classes=e({},r,t.classes);var i=document.createElement("div");return i.className=t.classes.actionbar,t.element.appendChild(i),t.element.content=document.createElement("div"),t.element.content.contentEditable=!0,t.element.content.className=t.classes.content,t.element.content.oninput=function(e){return t.onChange(e.target.innerHTML)},t.element.content.onkeydown=o,t.element.appendChild(t.element.content),t.actions.forEach(function(e){var n=document.createElement("button");if(n.className=t.classes.button,n.innerHTML=e.icon,n.title=e.title,n.setAttribute("type","button"),n.onclick=function(){return e.result()||t.element.content.focus()},e.state){var r=function(){return n.classList[e.state()?"add":"remove"](t.classes.selected)};t.element.content.addEventListener("keyup",r),t.element.content.addEventListener("mouseup",r),n.addEventListener("click",r)}i.appendChild(n)}),t.defaultParagraphSeparator&&l("defaultParagraphSeparator",t.defaultParagraphSeparator),t.styleWithCSS&&l("styleWithCSS"),t.element},c={exec:l,init:u};t.exec=l,t.init=u,t.default=c,Object.defineProperty(t,"__esModule",{value:!0})});
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.pell={})}(this,function(t){"use strict";var e=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t},n={bold:{icon:"<b>B</b>",title:"Bold",state:function(){return s("bold")},result:function(){return p("bold")}},italic:{icon:"<i>I</i>",title:"Italic",state:function(){return s("italic")},result:function(){return p("italic")}},underline:{icon:"<u>U</u>",title:"Underline",state:function(){return s("underline")},result:function(){return p("underline")}},strikethrough:{icon:"<strike>S</strike>",title:"Strike-through",state:function(){return s("strikeThrough")},result:function(){return p("strikeThrough")}},heading1:{icon:"<b>H<sub>1</sub></b>",title:"Heading 1",result:function(){return p(u,"<h1>")}},heading2:{icon:"<b>H<sub>2</sub></b>",title:"Heading 2",result:function(){return p(u,"<h2>")}},paragraph:{icon:"&#182;",title:"Paragraph",result:function(){return p(u,"<p>")}},quote:{icon:"&#8220; &#8221;",title:"Quote",result:function(){return p(u,"<blockquote>")}},olist:{icon:"&#35;",title:"Ordered List",result:function(){return p("insertOrderedList")}},ulist:{icon:"&#8226;",title:"Unordered List",result:function(){return p("insertUnorderedList")}},code:{icon:"&lt;/&gt;",title:"Code",result:function(){return p(u,"<pre>")}},line:{icon:"&#8213;",title:"Horizontal Line",result:function(){return p("insertHorizontalRule")}},link:{icon:"&#128279;",title:"Link",result:function(){var t=window.prompt("Enter the link URL");t&&p("createLink",t)}},image:{icon:"&#128247;",title:"Image",result:function(){var t=window.prompt("Enter the image URL");t&&p("insertImage",t)}}},r={actionbar:"pell-actionbar",button:"pell-button",content:"pell-content",selected:"pell-button-selected"},i=null,o=null,u="formatBlock",c=function(t,e,n){return t.addEventListener(e,n)},l=function(t,e){return t.appendChild(e)},a=function(t){return document.createElement(t)},s=function(t){return document.queryCommandState(t)},d=function(t){return document.queryCommandValue(t)},f=function(t,e){9===t.which?t.preventDefault():13===t.which&&"blockquote"===d(u)&&setTimeout(function(){return p(u,"<"+o+">")},0)},p=function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null;return document.execCommand(t,!1,e)},b=function(t){i=t.element,o=t.defaultParagraphSeparator||"div",n=t.actions?t.actions.map(function(t){return"string"==typeof t?n[t]:n[t.name]?e({},n[t.name],t):t}):Object.keys(n).map(function(t){return n[t]}),r=e({},r,t.classes);var s=a("div");s.className=r.actionbar,l(i,s);var d=a("div");return d.contentEditable=!0,d.className=r.content,d.oninput=function(e){var n=e.target.firstChild;n&&3===n.nodeType?p(u,"<"+o+">"):"<br>"===d.innerHTML&&(d.innerHTML=""),t.onChange(d.innerHTML)},d.onkeydown=function(t){return f(t)},l(i,d),n.forEach(function(t){var e=a("button");if(e.className=r.button,e.innerHTML=t.icon,e.title=t.title,e.setAttribute("type","button"),e.onclick=function(){return t.result()||d.focus()},t.state){var n=function(){return e.classList[t.state()?"add":"remove"](r.selected)};c(d,"keyup",n),c(d,"mouseup",n),c(e,"click",n)}l(s,e)}),o&&p("defaultParagraphSeparator",o),t.styleWithCSS&&p("styleWithCSS"),i},h={exec:p,init:b};t.exec=p,t.init=b,t.default=h,Object.defineProperty(t,"__esModule",{value:!0})});
diff --git a/package.json b/package.json
index 6ff86f5..033acd4 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "pell",
   "description": "pell - the simplest and smallest WYSIWYG text editor for web, with no dependencies",
   "author": "Jared Reich",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "./dist/pell.min.js",
   "scripts": {
     "dev": "gulp",
diff --git a/src/pell.js b/src/pell.js
index ccd2584..f174e10 100644
--- a/src/pell.js
+++ b/src/pell.js
@@ -1,4 +1,4 @@
-const actions = {
+let actions = {
   bold: {
     icon: '<b>B</b>',
     title: 'Bold',
@@ -26,22 +26,22 @@ const actions = {
   heading1: {
     icon: '<b>H<sub>1</sub></b>',
     title: 'Heading 1',
-    result: () => exec('formatBlock', '<H1>')
+    result: () => exec(formatBlock, '<h1>')
   },
   heading2: {
     icon: '<b>H<sub>2</sub></b>',
     title: 'Heading 2',
-    result: () => exec('formatBlock', '<H2>')
+    result: () => exec(formatBlock, '<h2>')
   },
   paragraph: {
     icon: '&#182;',
     title: 'Paragraph',
-    result: () => exec('formatBlock', '<P>')
+    result: () => exec(formatBlock, '<p>')
   },
   quote: {
     icon: '&#8220; &#8221;',
     title: 'Quote',
-    result: () => exec('formatBlock', '<BLOCKQUOTE>')
+    result: () => exec(formatBlock, '<blockquote>')
   },
   olist: {
     icon: '&#35;',
@@ -56,7 +56,7 @@ const actions = {
   code: {
     icon: '&lt;/&gt;',
     title: 'Code',
-    result: () => exec('formatBlock', '<PRE>')
+    result: () => exec(formatBlock, '<pre>')
   },
   line: {
     icon: '&#8213;',
@@ -81,25 +81,38 @@ const actions = {
   }
 }
 
-const classes = {
+let classes = {
   actionbar: 'pell-actionbar',
   button: 'pell-button',
   content: 'pell-content',
   selected: 'pell-button-selected'
 }
 
+let element = null
+let defaultParagraphSeparator = null
+
+const formatBlock = 'formatBlock'
+const addEventListener = (parent, type, listener) => parent.addEventListener(type, listener)
+const appendChild = (parent, child) => parent.appendChild(child)
+const createElement = tag => document.createElement(tag)
 const queryCommandState = command => document.queryCommandState(command)
+const queryCommandValue = command => document.queryCommandValue(command)
 
-const preventTab = event => {
-  if (event.which === 9) event.preventDefault()
+const handleKeyDown = (event, settings) => {
+  if (event.which === 9) {
+    event.preventDefault()
+  } else if (event.which === 13 && queryCommandValue(formatBlock) === 'blockquote') {
+    setTimeout(() => exec(formatBlock, `<${defaultParagraphSeparator}>`), 0)
+  }
 }
 
-export const exec = (command, value = null) => {
-  document.execCommand(command, false, value)
-}
+export const exec = (command, value = null) => document.execCommand(command, false, value)
 
 export const init = settings => {
-  settings.actions = settings.actions
+  element = settings.element
+  defaultParagraphSeparator = settings.defaultParagraphSeparator || 'div'
+
+  actions = settings.actions
     ? settings.actions.map(action => {
       if (typeof action === 'string') return actions[action]
       else if (actions[action.name]) return { ...actions[action.name], ...action }
@@ -107,41 +120,45 @@ export const init = settings => {
     })
     : Object.keys(actions).map(action => actions[action])
 
-  settings.classes = { ...classes, ...settings.classes }
+  classes = { ...classes, ...settings.classes }
 
-  const actionbar = document.createElement('div')
-  actionbar.className = settings.classes.actionbar
-  settings.element.appendChild(actionbar)
+  const actionbar = createElement('div')
+  actionbar.className = classes.actionbar
+  appendChild(element, actionbar)
 
-  settings.element.content = document.createElement('div')
-  settings.element.content.contentEditable = true
-  settings.element.content.className = settings.classes.content
-  settings.element.content.oninput = event => settings.onChange(event.target.innerHTML)
-  settings.element.content.onkeydown = preventTab
-  settings.element.appendChild(settings.element.content)
+  const content = createElement('div')
+  content.contentEditable = true
+  content.className = classes.content
+  content.oninput = ({ target: { firstChild } }) => {
+    if (firstChild && firstChild.nodeType === 3) exec(formatBlock, `<${defaultParagraphSeparator}>`)
+    else if (content.innerHTML === '<br>') content.innerHTML = ''
+    settings.onChange(content.innerHTML)
+  }
+  content.onkeydown = event => handleKeyDown(event, settings)
+  appendChild(element, content)
 
-  settings.actions.forEach(action => {
-    const button = document.createElement('button')
-    button.className = settings.classes.button
+  actions.forEach(action => {
+    const button = createElement('button')
+    button.className = classes.button
     button.innerHTML = action.icon
     button.title = action.title
     button.setAttribute('type', 'button')
-    button.onclick = () => action.result() || settings.element.content.focus()
+    button.onclick = () => action.result() || content.focus()
 
     if (action.state) {
-      const handler = () => button.classList[action.state() ? 'add' : 'remove'](settings.classes.selected)
-      settings.element.content.addEventListener('keyup', handler)
-      settings.element.content.addEventListener('mouseup', handler)
-      button.addEventListener('click', handler)
+      const handler = () => button.classList[action.state() ? 'add' : 'remove'](classes.selected)
+      addEventListener(content, 'keyup', handler)
+      addEventListener(content, 'mouseup', handler)
+      addEventListener(button, 'click', handler)
     }
 
-    actionbar.appendChild(button)
+    appendChild(actionbar, button)
   })
 
-  if (settings.defaultParagraphSeparator) exec('defaultParagraphSeparator', settings.defaultParagraphSeparator)
+  if (defaultParagraphSeparator) exec('defaultParagraphSeparator', defaultParagraphSeparator)
   if (settings.styleWithCSS) exec('styleWithCSS')
 
-  return settings.element
+  return element
 }
 
 export default { exec, init }