diff --git a/dist/js/medium-editor.js b/dist/js/medium-editor.js
index 0501e6279..d1cac3087 100644
--- a/dist/js/medium-editor.js
+++ b/dist/js/medium-editor.js
@@ -2,6 +2,7 @@ function MediumEditor(elements, options) {
     'use strict';
     return this.init(elements, options);
 }
+
 (function (window, document) {
     'use strict';
 
@@ -114,6 +115,10 @@ function MediumEditor(elements, options) {
                 if (e.which === 13 && !e.shiftKey) {
                     if (!(self.options.disableReturn || this.getAttribute('data-disable-return'))) {
                         document.execCommand('formatBlock', false, 'p');
+                        node = getSelectionStart();
+                        if (node.tagName.toLowerCase() === 'a') {
+                            document.execCommand('unlink', null, false);
+                        }
                     }
                 }
             });
@@ -389,17 +394,18 @@ function MediumEditor(elements, options) {
 
         showToolbarActions: function () {
             var self = this,
+                timeoutWrapper = function () {
+                    self.keepToolbarAlive = false;
+                    self.toolbar.style.display = 'none';
+                    document.removeEventListener('click', timeoutWrapper);
+                },
                 timer;
             this.anchorForm.style.display = 'none';
             this.toolbarActions.style.display = 'block';
             this.keepToolbarAlive = false;
             clearTimeout(timer);
             timer = setTimeout(function () {
-                document.addEventListener('click', function () {
-                    self.keepToolbarAlive = false;
-                    self.toolbar.style.display = 'none';
-                    document.removeEventListener('click', this);
-                });
+                document.addEventListener('click', timeoutWrapper);
             }, 300);
         },
 
@@ -436,7 +442,7 @@ function MediumEditor(elements, options) {
 
         createLink: function (input) {
             restoreSelection(this.savedSelection);
-            document.execCommand('CreateLink', false, input.value);
+            document.execCommand('createLink', false, input.value);
             this.showToolbarActions();
             input.value = '';
         },
@@ -517,5 +523,7 @@ function MediumEditor(elements, options) {
             }
             return this;
         }
+
     };
+
 }(window, document));
diff --git a/dist/js/medium-editor.min.js b/dist/js/medium-editor.min.js
index 908455633..fb315d486 100644
--- a/dist/js/medium-editor.min.js
+++ b/dist/js/medium-editor.min.js
@@ -1 +1 @@
-function MediumEditor(a,b){"use strict";return this.init(a,b)}!function(a,b){"use strict";function c(a,b){var c;if(void 0===a)return b;for(c in b)b.hasOwnProperty(c)&&a.hasOwnProperty(c)===!1&&(a[c]=b[c]);return a}function d(){var b,c,d,e=a.getSelection();if(e.getRangeAt&&e.rangeCount){for(d=[],b=0,c=e.rangeCount;c>b;b+=1)d.push(e.getRangeAt(b));return d}return null}function e(b){var c,d,e=a.getSelection();if(b)for(e.removeAllRanges(),c=0,d=b.length;d>c;c+=1)e.addRange(b[c])}function f(){var a=b.getSelection().anchorNode,c=a&&3===a.nodeType?a.parentNode:a;return c}MediumEditor.prototype={defaults:{anchorInputPlaceholder:"Paste or type a link",delay:0,diffLeft:0,diffTop:-10,disableReturn:!1,disableToolbar:!1,excludedActions:[],firstHeader:"h3",forcePlainText:!0,placeholder:"Type your text",secondHeader:"h4"},init:function(a,d){return this.elements="string"==typeof a?b.querySelectorAll(a):a,0!==this.elements.length?(this.isActive=!0,this.parentElements=["p","h1","h2","h3","h4","h5","h6","blockquote"],this.id=b.querySelectorAll(".medium-editor-toolbar").length+1,this.options=c(d,this.defaults),this.initElements().bindPaste().setPlaceholders().bindWindowActions()):void 0},initElements:function(){var a;for(a=0;a<this.elements.length;a+=1)this.elements[a].setAttribute("contentEditable",!0),this.elements[a].getAttribute("data-placeholder")||this.elements[a].setAttribute("data-placeholder",this.options.placeholder),this.elements[a].setAttribute("data-medium-element",!0),this.bindParagraphCreation(a).bindReturn(a),this.options.disableToolbar||this.elements[a].getAttribute("data-disable-toolbar")||this.initToolbar().bindSelect().bindButtons().bindAnchorForm();return this},bindParagraphCreation:function(a){var c=this;return this.elements[a].addEventListener("keyup",function(a){var d=f();d&&d.getAttribute("data-medium-element")&&0===d.children.length&&b.execCommand("formatBlock",!1,"p"),13!==a.which||a.shiftKey||c.options.disableReturn||this.getAttribute("data-disable-return")||b.execCommand("formatBlock",!1,"p")}),this},bindReturn:function(a){var b=this;this.elements[a].addEventListener("keypress",function(a){13!==a.which||a.shiftKey||(b.options.disableReturn||this.getAttribute("data-disable-return"))&&a.preventDefault()})},toolbarTemplate:function(){return'<ul id="medium-editor-toolbar-actions" class="medium-editor-toolbar-actions clearfix">    <li><button class="medium-editor-action medium-editor-action-bold" data-action="bold" data-element="b">B</button></li>    <li><button class="medium-editor-action medium-editor-action-italic" data-action="italic" data-element="i">I</button></li>    <li><button class="medium-editor-action medium-editor-action-underline" data-action="underline" data-element="u">S</button></li>    <li><button class="medium-editor-action medium-editor-action-anchor" data-action="anchor" data-element="a">#</button></li>    <li><button class="medium-editor-action medium-editor-action-header1" data-action="append-'+this.options.firstHeader+'" data-element="'+this.options.firstHeader+'">h1</button></li>'+'    <li><button class="medium-editor-action medium-editor-action-header2" data-action="append-'+this.options.secondHeader+'" data-element="'+this.options.secondHeader+'">h2</button></li>'+'    <li><button class="medium-editor-action medium-editor-action-quote" data-action="append-blockquote" data-element="blockquote">&ldquo;</button></li>'+"</ul>"+'<div class="medium-editor-toolbar-form-anchor" id="medium-editor-toolbar-form-anchor">'+'    <input type="text" value="" placeholder="'+this.options.anchorInputPlaceholder+'"><a href="#">&times;</a>'+"</div>"},initToolbar:function(){return this.toolbar=this.createToolbar(),this.keepToolbarAlive=!1,this.anchorForm=this.toolbar.querySelector(".medium-editor-toolbar-form-anchor"),this.toolbarActions=this.toolbar.querySelector(".medium-editor-toolbar-actions"),this},createToolbar:function(){var a=b.createElement("div");return a.id="medium-editor-toolbar-"+this.id,a.className="medium-editor-toolbar",a.innerHTML=this.toolbarTemplate(),b.getElementsByTagName("body")[0].appendChild(a),a},bindSelect:function(){var a,b=this,c="";for(this.checkSelectionWrapper=function(a){clearTimeout(c),setTimeout(function(){b.checkSelection(a)},b.options.delay)},a=0;a<this.elements.length;a+=1)this.elements[a].addEventListener("mouseup",this.checkSelectionWrapper),this.elements[a].addEventListener("keyup",this.checkSelectionWrapper);return this},checkSelection:function(){var b;return this.keepToolbarAlive!==!0&&(b=a.getSelection(),""===b.toString().trim()?this.toolbar.style.display="none":(this.selection=b,this.selectionRange=this.selection.getRangeAt(0),this.getSelectionElement().getAttribute("data-disable-toolbar")||(this.toolbar.style.display="block",this.setToolbarButtonStates().setToolbarPosition().showToolbarActions()))),this},getSelectionElement:function(){var b=a.getSelection(),c=b.getRangeAt(0),d=c.commonAncestorContainer.parentNode;try{for(;!d.getAttribute("data-medium-element");)d=d.parentNode}catch(e){return this.elements[0]}return d},setToolbarPosition:function(){var b=50,c=a.getSelection(),d=c.getRangeAt(0),e=d.getBoundingClientRect(),f=this.options.diffLeft-this.toolbar.offsetWidth/2,g=(e.left+e.right)/2,h=this.toolbar.offsetWidth/2;return e.top<b?(this.toolbar.classList.add("medium-toolbar-arrow-over"),this.toolbar.classList.remove("medium-toolbar-arrow-under"),this.toolbar.style.top=b+e.bottom-this.options.diffTop+a.pageYOffset-this.toolbar.offsetHeight+"px"):(this.toolbar.classList.add("medium-toolbar-arrow-under"),this.toolbar.classList.remove("medium-toolbar-arrow-over"),this.toolbar.style.top=e.top+this.options.diffTop+a.pageYOffset-this.toolbar.offsetHeight+"px"),this.toolbar.style.left=h>g?f+h+"px":a.innerWidth-g<h?a.innerWidth+f-h+"px":f+g+"px",this},setToolbarButtonStates:function(){var a,b=this.toolbarActions.querySelectorAll("button");for(a=0;a<b.length;a+=1)b[a].classList.remove("medium-editor-button-active"),this.showHideButton(b[a]);return this.checkActiveButtons(),this},showHideButton:function(a){a.style.display=this.options.excludedActions.indexOf(a.getAttribute("data-element"))>-1?"none":"block"},checkActiveButtons:function(){var a=this.selection.anchorNode;for(a.tagName||(a=this.selection.anchorNode.parentNode);void 0!==a.tagName&&-1===this.parentElements.indexOf(a.tagName);)this.activateButton(a.tagName.toLowerCase()),a=a.parentNode},activateButton:function(a){var b=this.toolbar.querySelector('[data-element="'+a+'"]');null!==b&&-1===b.className.indexOf("medium-editor-button-active")&&(b.className+=" medium-editor-button-active")},bindButtons:function(){var a,b=this.toolbar.querySelectorAll("button"),c=this,d=function(a){a.preventDefault(),a.stopPropagation(),void 0===c.selection&&c.checkSelection(a),this.className.indexOf("medium-editor-button-active")>-1?this.classList.remove("medium-editor-button-active"):this.className+=" medium-editor-button-active",c.execAction(this.getAttribute("data-action"),a)};for(a=0;a<b.length;a+=1)b[a].addEventListener("click",d);return this.setFirstAndLastItems(b),this},setFirstAndLastItems:function(a){return a[0].className+=" medium-editor-button-first",a[a.length-1].className+=" medium-editor-button-last",this},execAction:function(a,c){a.indexOf("append-")>-1?(this.execFormatBlock(a.replace("append-","")),this.setToolbarPosition(),this.setToolbarButtonStates()):"anchor"===a?this.triggerAnchorAction(c):(b.execCommand(a,null,!1),this.setToolbarPosition())},triggerAnchorAction:function(){return"a"===this.selection.anchorNode.parentNode.tagName.toLowerCase()?b.execCommand("unlink",null,!1):"block"===this.anchorForm.style.display?this.showToolbarActions():this.showAnchorForm(),this},execFormatBlock:function(a){var c=this.getSelectionData(this.selection.anchorNode);return"blockquote"===a&&"blockquote"===c.el.parentNode.tagName.toLowerCase()?b.execCommand("outdent",!1,null):(c.tagName===a&&(a="p"),b.execCommand("formatBlock",!1,a))},getSelectionData:function(a){var b;for(a&&a.tagName&&(b=a.tagName.toLowerCase());a&&-1===this.parentElements.indexOf(b);)a=a.parentNode,a&&a.tagName&&(b=a.tagName.toLowerCase());return{el:a,tagName:b}},getFirstChild:function(a){for(var b=a.firstChild;null!==b&&1!==b.nodeType;)b=b.nextSibling;return b},bindElementToolbarEvents:function(a){var b=this;a.addEventListener("mouseup",function(a){b.checkSelection(a)}),a.addEventListener("keyup",function(a){b.checkSelection(a)})},showToolbarActions:function(){var a,c=this;this.anchorForm.style.display="none",this.toolbarActions.style.display="block",this.keepToolbarAlive=!1,clearTimeout(a),a=setTimeout(function(){b.addEventListener("click",function(){c.keepToolbarAlive=!1,c.toolbar.style.display="none",b.removeEventListener("click",this)})},300)},showAnchorForm:function(){var a=this.anchorForm.querySelector("input");this.toolbarActions.style.display="none",this.savedSelection=d(),this.anchorForm.style.display="block",this.keepToolbarAlive=!0,a.focus(),a.value=""},bindAnchorForm:function(){var a=this.anchorForm.querySelector("input"),b=this.anchorForm.querySelector("a"),c=this;return this.anchorForm.addEventListener("click",function(a){a.stopPropagation()}),a.addEventListener("keyup",function(a){13===a.keyCode&&(a.preventDefault(),c.createLink(this))}),b.addEventListener("click",function(a){a.preventDefault(),c.showToolbarActions(),e(c.savedSelection)}),this},createLink:function(a){e(this.savedSelection),b.execCommand("CreateLink",!1,a.value),this.showToolbarActions(),a.value=""},bindWindowActions:function(){var b,c=this;return a.addEventListener("resize",function(){clearTimeout(b),b=setTimeout(function(){c.setToolbarPosition()},100)}),this},activate:function(){var a;if(!this.isActive){for(this.isActive=!0,a=0;a<this.elements.length;a+=1)this.elements[a].setAttribute("contentEditable",!0);this.bindSelect()}},deactivate:function(){var a;if(this.isActive)for(this.isActive=!1,this.toolbar.style.display="none",a=0;a<this.elements.length;a+=1)this.elements[a].removeEventListener("mouseup",this.checkSelectionWrapper),this.elements[a].removeEventListener("keyup",this.checkSelectionWrapper),this.elements[a].removeAttribute("contentEditable")},bindPaste:function(){if(this.options.forcePlainText){var a,c=function(a){a.target.classList.remove("medium-editor-placeholder"),a.clipboardData&&a.clipboardData.getData&&(a.preventDefault(),b.execCommand("insertHTML",!1,a.clipboardData.getData("text/plain").replace(/[\r\n]/g,"<br>")))};for(a=0;a<this.elements.length;a+=1)this.elements[a].addEventListener("paste",c);return this}},setPlaceholders:function(){var a,b=function(a){""===a.textContent.replace(/^\s+|\s+$/g,"")&&a.classList.add("medium-editor-placeholder")},c=function(a){this.classList.remove("medium-editor-placeholder"),"keypress"!==a.type&&b(this)};for(a=0;a<this.elements.length;a+=1)b(this.elements[a]),this.elements[a].addEventListener("focusout",c),this.elements[a].addEventListener("keypress",c);return this}}}(window,document);
\ No newline at end of file
+function MediumEditor(a,b){"use strict";return this.init(a,b)}!function(a,b){"use strict";function c(a,b){var c;if(void 0===a)return b;for(c in b)b.hasOwnProperty(c)&&a.hasOwnProperty(c)===!1&&(a[c]=b[c]);return a}function d(){var b,c,d,e=a.getSelection();if(e.getRangeAt&&e.rangeCount){for(d=[],b=0,c=e.rangeCount;c>b;b+=1)d.push(e.getRangeAt(b));return d}return null}function e(b){var c,d,e=a.getSelection();if(b)for(e.removeAllRanges(),c=0,d=b.length;d>c;c+=1)e.addRange(b[c])}function f(){var a=b.getSelection().anchorNode,c=a&&3===a.nodeType?a.parentNode:a;return c}MediumEditor.prototype={defaults:{anchorInputPlaceholder:"Paste or type a link",delay:0,diffLeft:0,diffTop:-10,disableReturn:!1,disableToolbar:!1,excludedActions:[],firstHeader:"h3",forcePlainText:!0,placeholder:"Type your text",secondHeader:"h4"},init:function(a,d){return this.elements="string"==typeof a?b.querySelectorAll(a):a,0!==this.elements.length?(this.isActive=!0,this.parentElements=["p","h1","h2","h3","h4","h5","h6","blockquote"],this.id=b.querySelectorAll(".medium-editor-toolbar").length+1,this.options=c(d,this.defaults),this.initElements().bindPaste().setPlaceholders().bindWindowActions()):void 0},initElements:function(){var a;for(a=0;a<this.elements.length;a+=1)this.elements[a].setAttribute("contentEditable",!0),this.elements[a].getAttribute("data-placeholder")||this.elements[a].setAttribute("data-placeholder",this.options.placeholder),this.elements[a].setAttribute("data-medium-element",!0),this.bindParagraphCreation(a).bindReturn(a),this.options.disableToolbar||this.elements[a].getAttribute("data-disable-toolbar")||this.initToolbar().bindSelect().bindButtons().bindAnchorForm();return this},bindParagraphCreation:function(a){var c=this;return this.elements[a].addEventListener("keyup",function(a){var d=f();d&&d.getAttribute("data-medium-element")&&0===d.children.length&&b.execCommand("formatBlock",!1,"p"),13!==a.which||a.shiftKey||c.options.disableReturn||this.getAttribute("data-disable-return")||(b.execCommand("formatBlock",!1,"p"),d=f(),"a"===d.tagName.toLowerCase()&&b.execCommand("unlink",null,!1))}),this},bindReturn:function(a){var b=this;this.elements[a].addEventListener("keypress",function(a){13!==a.which||a.shiftKey||(b.options.disableReturn||this.getAttribute("data-disable-return"))&&a.preventDefault()})},toolbarTemplate:function(){return'<ul id="medium-editor-toolbar-actions" class="medium-editor-toolbar-actions clearfix">    <li><button class="medium-editor-action medium-editor-action-bold" data-action="bold" data-element="b">B</button></li>    <li><button class="medium-editor-action medium-editor-action-italic" data-action="italic" data-element="i">I</button></li>    <li><button class="medium-editor-action medium-editor-action-underline" data-action="underline" data-element="u">S</button></li>    <li><button class="medium-editor-action medium-editor-action-anchor" data-action="anchor" data-element="a">#</button></li>    <li><button class="medium-editor-action medium-editor-action-header1" data-action="append-'+this.options.firstHeader+'" data-element="'+this.options.firstHeader+'">h1</button></li>'+'    <li><button class="medium-editor-action medium-editor-action-header2" data-action="append-'+this.options.secondHeader+'" data-element="'+this.options.secondHeader+'">h2</button></li>'+'    <li><button class="medium-editor-action medium-editor-action-quote" data-action="append-blockquote" data-element="blockquote">&ldquo;</button></li>'+"</ul>"+'<div class="medium-editor-toolbar-form-anchor" id="medium-editor-toolbar-form-anchor">'+'    <input type="text" value="" placeholder="'+this.options.anchorInputPlaceholder+'"><a href="#">&times;</a>'+"</div>"},initToolbar:function(){return this.toolbar=this.createToolbar(),this.keepToolbarAlive=!1,this.anchorForm=this.toolbar.querySelector(".medium-editor-toolbar-form-anchor"),this.toolbarActions=this.toolbar.querySelector(".medium-editor-toolbar-actions"),this},createToolbar:function(){var a=b.createElement("div");return a.id="medium-editor-toolbar-"+this.id,a.className="medium-editor-toolbar",a.innerHTML=this.toolbarTemplate(),b.getElementsByTagName("body")[0].appendChild(a),a},bindSelect:function(){var a,b=this,c="";for(this.checkSelectionWrapper=function(a){clearTimeout(c),setTimeout(function(){b.checkSelection(a)},b.options.delay)},a=0;a<this.elements.length;a+=1)this.elements[a].addEventListener("mouseup",this.checkSelectionWrapper),this.elements[a].addEventListener("keyup",this.checkSelectionWrapper);return this},checkSelection:function(){var b;return this.keepToolbarAlive!==!0&&(b=a.getSelection(),""===b.toString().trim()?this.toolbar.style.display="none":(this.selection=b,this.selectionRange=this.selection.getRangeAt(0),this.getSelectionElement().getAttribute("data-disable-toolbar")||(this.toolbar.style.display="block",this.setToolbarButtonStates().setToolbarPosition().showToolbarActions()))),this},getSelectionElement:function(){var b=a.getSelection(),c=b.getRangeAt(0),d=c.commonAncestorContainer.parentNode;try{for(;!d.getAttribute("data-medium-element");)d=d.parentNode}catch(e){return this.elements[0]}return d},setToolbarPosition:function(){var b=50,c=a.getSelection(),d=c.getRangeAt(0),e=d.getBoundingClientRect(),f=this.options.diffLeft-this.toolbar.offsetWidth/2,g=(e.left+e.right)/2,h=this.toolbar.offsetWidth/2;return e.top<b?(this.toolbar.classList.add("medium-toolbar-arrow-over"),this.toolbar.classList.remove("medium-toolbar-arrow-under"),this.toolbar.style.top=b+e.bottom-this.options.diffTop+a.pageYOffset-this.toolbar.offsetHeight+"px"):(this.toolbar.classList.add("medium-toolbar-arrow-under"),this.toolbar.classList.remove("medium-toolbar-arrow-over"),this.toolbar.style.top=e.top+this.options.diffTop+a.pageYOffset-this.toolbar.offsetHeight+"px"),this.toolbar.style.left=h>g?f+h+"px":a.innerWidth-g<h?a.innerWidth+f-h+"px":f+g+"px",this},setToolbarButtonStates:function(){var a,b=this.toolbarActions.querySelectorAll("button");for(a=0;a<b.length;a+=1)b[a].classList.remove("medium-editor-button-active"),this.showHideButton(b[a]);return this.checkActiveButtons(),this},showHideButton:function(a){a.style.display=this.options.excludedActions.indexOf(a.getAttribute("data-element"))>-1?"none":"block"},checkActiveButtons:function(){var a=this.selection.anchorNode;for(a.tagName||(a=this.selection.anchorNode.parentNode);void 0!==a.tagName&&-1===this.parentElements.indexOf(a.tagName);)this.activateButton(a.tagName.toLowerCase()),a=a.parentNode},activateButton:function(a){var b=this.toolbar.querySelector('[data-element="'+a+'"]');null!==b&&-1===b.className.indexOf("medium-editor-button-active")&&(b.className+=" medium-editor-button-active")},bindButtons:function(){var a,b=this.toolbar.querySelectorAll("button"),c=this,d=function(a){a.preventDefault(),a.stopPropagation(),void 0===c.selection&&c.checkSelection(a),this.className.indexOf("medium-editor-button-active")>-1?this.classList.remove("medium-editor-button-active"):this.className+=" medium-editor-button-active",c.execAction(this.getAttribute("data-action"),a)};for(a=0;a<b.length;a+=1)b[a].addEventListener("click",d);return this.setFirstAndLastItems(b),this},setFirstAndLastItems:function(a){return a[0].className+=" medium-editor-button-first",a[a.length-1].className+=" medium-editor-button-last",this},execAction:function(a,c){a.indexOf("append-")>-1?(this.execFormatBlock(a.replace("append-","")),this.setToolbarPosition(),this.setToolbarButtonStates()):"anchor"===a?this.triggerAnchorAction(c):(b.execCommand(a,null,!1),this.setToolbarPosition())},triggerAnchorAction:function(){return"a"===this.selection.anchorNode.parentNode.tagName.toLowerCase()?b.execCommand("unlink",null,!1):"block"===this.anchorForm.style.display?this.showToolbarActions():this.showAnchorForm(),this},execFormatBlock:function(a){var c=this.getSelectionData(this.selection.anchorNode);return"blockquote"===a&&"blockquote"===c.el.parentNode.tagName.toLowerCase()?b.execCommand("outdent",!1,null):(c.tagName===a&&(a="p"),b.execCommand("formatBlock",!1,a))},getSelectionData:function(a){var b;for(a&&a.tagName&&(b=a.tagName.toLowerCase());a&&-1===this.parentElements.indexOf(b);)a=a.parentNode,a&&a.tagName&&(b=a.tagName.toLowerCase());return{el:a,tagName:b}},getFirstChild:function(a){for(var b=a.firstChild;null!==b&&1!==b.nodeType;)b=b.nextSibling;return b},bindElementToolbarEvents:function(a){var b=this;a.addEventListener("mouseup",function(a){b.checkSelection(a)}),a.addEventListener("keyup",function(a){b.checkSelection(a)})},showToolbarActions:function(){var a,c=this,d=function(){c.keepToolbarAlive=!1,c.toolbar.style.display="none",b.removeEventListener("click",d)};this.anchorForm.style.display="none",this.toolbarActions.style.display="block",this.keepToolbarAlive=!1,clearTimeout(a),a=setTimeout(function(){b.addEventListener("click",d)},300)},showAnchorForm:function(){var a=this.anchorForm.querySelector("input");this.toolbarActions.style.display="none",this.savedSelection=d(),this.anchorForm.style.display="block",this.keepToolbarAlive=!0,a.focus(),a.value=""},bindAnchorForm:function(){var a=this.anchorForm.querySelector("input"),b=this.anchorForm.querySelector("a"),c=this;return this.anchorForm.addEventListener("click",function(a){a.stopPropagation()}),a.addEventListener("keyup",function(a){13===a.keyCode&&(a.preventDefault(),c.createLink(this))}),b.addEventListener("click",function(a){a.preventDefault(),c.showToolbarActions(),e(c.savedSelection)}),this},createLink:function(a){e(this.savedSelection),b.execCommand("createLink",!1,a.value),this.showToolbarActions(),a.value=""},bindWindowActions:function(){var b,c=this;return a.addEventListener("resize",function(){clearTimeout(b),b=setTimeout(function(){c.setToolbarPosition()},100)}),this},activate:function(){var a;if(!this.isActive){for(this.isActive=!0,a=0;a<this.elements.length;a+=1)this.elements[a].setAttribute("contentEditable",!0);this.bindSelect()}},deactivate:function(){var a;if(this.isActive)for(this.isActive=!1,this.toolbar.style.display="none",a=0;a<this.elements.length;a+=1)this.elements[a].removeEventListener("mouseup",this.checkSelectionWrapper),this.elements[a].removeEventListener("keyup",this.checkSelectionWrapper),this.elements[a].removeAttribute("contentEditable")},bindPaste:function(){if(this.options.forcePlainText){var a,c=function(a){a.target.classList.remove("medium-editor-placeholder"),a.clipboardData&&a.clipboardData.getData&&(a.preventDefault(),b.execCommand("insertHTML",!1,a.clipboardData.getData("text/plain").replace(/[\r\n]/g,"<br>")))};for(a=0;a<this.elements.length;a+=1)this.elements[a].addEventListener("paste",c);return this}},setPlaceholders:function(){var a,b=function(a){""===a.textContent.replace(/^\s+|\s+$/g,"")&&a.classList.add("medium-editor-placeholder")},c=function(a){this.classList.remove("medium-editor-placeholder"),"keypress"!==a.type&&b(this)};for(a=0;a<this.elements.length;a+=1)b(this.elements[a]),this.elements[a].addEventListener("focusout",c),this.elements[a].addEventListener("keypress",c);return this}}}(window,document);
\ No newline at end of file
diff --git a/src/js/medium-editor.js b/src/js/medium-editor.js
index b5020fc05..2522c61dc 100644
--- a/src/js/medium-editor.js
+++ b/src/js/medium-editor.js
@@ -4,6 +4,7 @@ function MediumEditor(elements, options) {
     'use strict';
     return this.init(elements, options);
 }
+
 (function (window, document) {
     'use strict';
 
@@ -116,6 +117,10 @@ function MediumEditor(elements, options) {
                 if (e.which === 13 && !e.shiftKey) {
                     if (!(self.options.disableReturn || this.getAttribute('data-disable-return'))) {
                         document.execCommand('formatBlock', false, 'p');
+                        node = getSelectionStart();
+                        if (node.tagName.toLowerCase() === 'a') {
+                            document.execCommand('unlink', null, false);
+                        }
                     }
                 }
             });
@@ -391,17 +396,18 @@ function MediumEditor(elements, options) {
 
         showToolbarActions: function () {
             var self = this,
+                timeoutWrapper = function () {
+                    self.keepToolbarAlive = false;
+                    self.toolbar.style.display = 'none';
+                    document.removeEventListener('click', timeoutWrapper);
+                },
                 timer;
             this.anchorForm.style.display = 'none';
             this.toolbarActions.style.display = 'block';
             this.keepToolbarAlive = false;
             clearTimeout(timer);
             timer = setTimeout(function () {
-                document.addEventListener('click', function () {
-                    self.keepToolbarAlive = false;
-                    self.toolbar.style.display = 'none';
-                    document.removeEventListener('click', this);
-                });
+                document.addEventListener('click', timeoutWrapper);
             }, 300);
         },
 
@@ -438,7 +444,7 @@ function MediumEditor(elements, options) {
 
         createLink: function (input) {
             restoreSelection(this.savedSelection);
-            document.execCommand('CreateLink', false, input.value);
+            document.execCommand('createLink', false, input.value);
             this.showToolbarActions();
             input.value = '';
         },
@@ -519,5 +525,7 @@ function MediumEditor(elements, options) {
             }
             return this;
         }
+
     };
+
 }(window, document));