diff --git a/assets/mustache-tidy.js b/assets/mustache-tidy.js
index c38d678..a30a95f 100644
--- a/assets/mustache-tidy.js
+++ b/assets/mustache-tidy.js
@@ -1089,6 +1089,8 @@ var endsWithTag = utils.endsWithTag;
 var log = debug.log;
 var regs = {
     spaces: new RegExp('\\s+', 'g'),
+    startSpaces: new RegExp('^\\s* '),
+    endSpaces: new RegExp(' \\s*$'),
     tagName: new RegExp('(?:[^"\']+|"[^"]+"|\'[^\']+\')', 'g'),
     tag: new RegExp('\\{\\{\\s*([#^/])([^}]*)\\}\\}', 'g')
 };
@@ -1202,7 +1204,7 @@ function mustacheTidy(html, options) {
 
     // Perform tidy on single text DOM node
     function tidyTextNode(node, level) {
-        node.nodeValue = node.nodeValue.trim();
+        node.nodeValue = smartTrim(node.nodeValue);
 
         // Remove empty text nodes
         if (!node.nodeValue.length && node.parentElement) {
@@ -1389,6 +1391,20 @@ function mustacheTidy(html, options) {
 
         opened.node = closed.node = null;
     }
+
+    // Trim text, leaving single start and ending spaces
+    function smartTrim(text) {
+        var hasStartSpace = !!regs.startSpaces.exec(text);
+        var hasEndSpace = !!regs.endSpaces.exec(text);
+
+        text = text.trim();
+        if (!text.length) return '';
+
+        if (hasStartSpace) text = ' ' + text;
+        if (hasEndSpace) text = text + ' ';
+
+        return text;
+    }
 }
 
 
diff --git a/assets/mustache-tidy.min.js b/assets/mustache-tidy.min.js
index d4435c1..4bf2377 100644
--- a/assets/mustache-tidy.min.js
+++ b/assets/mustache-tidy.min.js
@@ -1 +1 @@
-var mustacheTidy=function(e){function n(t){if(o[t])return o[t].exports;var d=o[t]={i:t,l:!1,exports:{}};return e[t].call(d.exports,d,d.exports,n),d.l=!0,d.exports}var o={};return n.m=e,n.c=o,n.i=function(e){return e},n.d=function(e,o,t){n.o(e,o)||Object.defineProperty(e,o,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var o=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(o,"a",o),o},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="",n(n.s=10)}([function(e,n,o){var t=o(3);if(t.isFrontEnd)e.exports={jsdom:null,Node:Node};else{var d=o(!function(){var e=new Error('Cannot find module "jsdom"');throw e.code="MODULE_NOT_FOUND",e}());d.defaultDocumentFeatures={FetchExternalResources:!1,ProcessExternalResources:!1};var l=o(!function(){var e=new Error('Cannot find module "jsdom/lib/jsdom/living/generated/Node.js"');throw e.code="MODULE_NOT_FOUND",e}());e.exports={jsdom:d.jsdom,Node:l.expose.Window.Node}}},function(e,n,o){function t(e){g=e}function d(){if(g.debug){if(a.isFrontEnd)return console.log.apply(console,arguments);for(var e=Array.prototype.slice.apply(arguments),n=0;n<e.length;n++)null!==e[n]&&"object"==typeof e[n]&&"undefined"!=typeof e[n].nodeType&&"undefined"!=typeof e[n].node&&(e[n].node&&"object"==typeof e[n].node&&e[n].node.nodeType===u.TEXT_NODE?e[n].node='"'+e[n].node.nodeValue+'"':e[n].nodeType===u.TEXT_NODE&&(e[n]='"'+e[n].nodeValue+'"'));console.log.apply(console,e)}}function l(e){function n(e,t){if(t||(t=0),e.nodeType===u.TEXT_NODE)return o(t)+e.nodeValue+"\n";if(e.nodeType!==u.ELEMENT_NODE)return"";var d=o(t),l=e.nodeName.toLowerCase(),i=d+"<"+l+">\n",r=e.childNodes;t++;for(var a=0;a<r.length;a++)i+=n(r[a],t);return i+d+"</"+l+">\n"}function o(e){return e?r(" ",4*e):""}if(g.debug){var t=n(e);d("result html: "),d(t)}}function i(e,n){function o(e){var n=e.node,o=n.nodeValue,t=e.index,l=e.tag.length;n.nodeValue=o.substring(0,t+1)+"#"+o.substr(t+2,l-4)+"#"+o.substring(t-1+l),d("replace ->",o,"<- with ->",n.nodeValue)}if(g.debug){var t=null;for(var l in e){t=e[l];for(var i=0;i<t.length;i++)o(t[i])}for(var i=0;i<n.length;i++)t=n[i],o(t.closed),t.opened&&o(t.opened)}}function r(e,n){return Array(1*n+1).join(e)}var a=o(3),s=o(0),u=s.Node;e.exports={init:t,log:d,logResult:l,hideInvalidTags:i};var g={}},function(e,n,o){function t(e){p.init(e),c=e.doc}function d(e,n){return Array(1*n+1).join(e)}function l(e,n){e.index=0,e.node=i(e.tag),"undefined"!=typeof n&&(e.level=n)}function i(e){return c.createTextNode(e)}function r(e){return 0===e.index||!e.node.nodeValue.substring(0,e.index).trim().length}function a(e){var n=e.node.nodeValue,o=e.index+e.tag.length;return n.length===o||!n.substring(o).trim().length}function s(e){return e&&e.nodeType!==f.COMMENT_NODE}function u(e){return!!s(e)&&(!(e.nodeType===f.TEXT_NODE&&!e.nodeValue.trim().length)||!!e.nextSibling&&u(e.nextSibling))}var g=o(0),p=o(1),c=null,f=(p.log,g.Node);e.exports={init:t,repeatString:d,updateTextNodeData:l,createTextNode:i,startsWithTag:r,endsWithTag:a,isDataElement:s,isFullDataElement:u}},function(e,n){e.exports={isFrontEnd:"undefined"!=typeof window}},function(e,n,o){function t(e){s.init(e),a.init(e)}function d(e,n){var o=e.node.parentElement.compareDocumentPosition(n.node.parentElement);o&f.DOCUMENT_POSITION_CONTAINS?l(e,n,!0):o&f.DOCUMENT_POSITION_CONTAINED_BY?i(e,n,!0):e.level>=n.level?(v("-------------- extend tag both ways starting from closed"),i(e,n,!0),l(e,n)):(v("-------------- extend tag both ways starting from opened"),l(e,n,!0),i(e,n))}function l(e,n,o){v("-------------- extend tag forward");var t=e.level,d=e.node,l=null;for(!e.node.nextSibling&&c(e)||(l=g(n.tag),e.node.parentElement.appendChild(l));;)if(t--,d=d.parentElement,d.nextSibling){if(u(e,t),d.parentElement.insertBefore(e.node,d.nextSibling),o?d.parentElement.contains(n.node):t<=n.level)break;l=g(n.tag),d.parentElement.appendChild(l)}}function i(e,n,o){v("-------------- extend tag back");var t=n.level,d=n.node.parentElement,l=null;for(!n.node.previousSibling&&p(n)||(l=g(e.tag),d.insertBefore(l,d.firstChild)),d=n.node;;)if(t--,d=d.parentElement,d.previousSibling){if(u(n,t),d.parentElement.insertBefore(n.node,d),o?d.parentElement.contains(e.node):t<=e.level)break;l=g(e.tag),d.parentElement.insertBefore(l,d.parentElement.firstChild)}}var r=o(0),a=o(2),s=o(1),u=a.updateTextNodeData,g=a.createTextNode,p=a.startsWithTag,c=a.endsWithTag,f=r.Node,v=s.log;e.exports={init:t,extendSeparatedTagParts:d,extendTagForward:l,extendTagBack:i}},function(e,n,o){function t(e){u.init(e),s.init(e)}function d(e){e.opened.node&&e.closed&&i(e.opened)&&(h("-- fix table tag: ",e),l(e.opened,e.closed))}function l(e,n){function o(t){if(t.nodeType===v.ELEMENT_NODE&&t.firstChild)if(x[t.nodeName])t.insertBefore(f(e.tag),t.firstChild),t.appendChild(f(n.tag));else for(var d=0;d<t.childNodes.length;d++)o(t.childNodes[d])}for(var t=e.node;;){if(t=t.nextSibling,t===n.node)break;o(t)}g(e)&&p(e)?e.node.parentElement.removeChild(e.node):r(e),g(n)&&p(n)?n.node.parentElement.removeChild(n.node):r(n)}function i(e){return e.node.parentElement&&!!m[e.node.parentElement.nodeName]}function r(e){var n=e.node.nodeValue;e.node.nodeValue=n.substring(0,e.index)+c(" ",e.tag.length)+n.substring(e.index+e.tag.length)}var a=o(0),s=o(2),u=o(1),g=s.startsWithTag,p=s.endsWithTag,c=s.repeatString,f=s.createTextNode,v=a.Node,h=u.log,m={TABLE:1,THEAD:1,TBODY:1,TR:1},x={TD:1,TH:1};e.exports={init:t,run:d,tableCells:x}},function(e,n,o){function t(e){c.init(e),p.init(e),E=e.root,y=e.regs.spaces,T={},N=[]}function d(e){b=e;for(var n=0;n<b.length;n++){var o=b[n];if(x("-- improve tag: ",o),o.opened.node&&o.closed){var t=l(o);if(t){var d=i(o,t);n=d-1}else r(o)&&n--}}for(var n=0;n<N.length;n++)N[n]&&(N[n].nodeValue=N[n].nodeValue.replace(y," ").trim())}function l(e){var n=T[e.opened.level];if(!n||!n.length)return null;var o=n.length-1;do{var t=n[o];o--}while((!t.opened.node||t===e)&&o>=0);var d=t.opened.node&&t.opened.name===e.opened.name&&t.opened.type===e.opened.type;if(!d)return null;var l=!1;if(e.opened.node.previousSibling===t.closed.node)l=v(e.opened)&&h(t.closed);else if(e.opened.node===t.closed.node){var i=t.closed.node.nodeValue.substring(t.closed.index,e.opened.index);l=i.trim().length===t.closed.tag.length}return l?t:null}function i(e,n){x("-- merge with:",n),v(e.opened)&&h(e.opened)?e.opened.node.parentElement.removeChild(e.opened.node):u(e.opened,!0),v(n.closed)&&h(n.closed)?n.closed.node.parentElement.removeChild(n.closed.node):u(n.closed,!0);for(var o in e.closed)n.closed[o]=e.closed[o];return e.opened.node=null,e.closed.node=null,n.opened.improveKey}function r(e){for(var n=e.opened.level;s(e);)a(e);var o=e.opened.level,t=n!==o;if(T[o]||(T[o]=[]),t){var d=T[n];if(d&&d.length){var l=d[d.length-1];l===e&&d.pop()}T[o].push(e)}else{var i=T[n].length,l=i?T[n][i-1]:null;l&&l===e||T[n].push(e)}return t}function a(e){var n=e.opened,o=e.closed,t=n.node.parentElement,d=t.parentElement;h(n)||u(n),d.insertBefore(n.node,t),v(o)||u(o),t.nextSibling?d.insertBefore(o.node,t.nextSibling):d.appendChild(o.node),n.level--,o.level--}function s(e){var n=e.opened,o=e.closed,t=n.node.parentElement;return t&&t!==E&&t.parentElement&&v(n)&&h(o)&&!n.node.previousSibling&&!o.node.nextSibling}function u(e,n){var o=e.node.nodeValue;e.node.nodeValue=o.substring(0,e.index)+m(" ",e.tag.length)+o.substring(e.index+e.tag.length),N.push(e.node),n||f(e)}var g=o(0),p=o(2),c=o(1),f=(g.Node,p.updateTextNodeData),v=p.startsWithTag,h=p.endsWithTag,m=p.repeatString,x=c.log,E=null,b=[],T={},N=[],y=null;e.exports={init:t,run:d}},function(e,n,o){function t(e){v.init(e),f.init(e),y=[]}function d(e,n){N("closing tag is in ancestor node of opening tag"),m(e)&&!E(e.node.previousSibling)?(N("--------------- move opened tag up outside"),s(e,n.level)):x(e)&&!E(e.node.nextSibling)&&(N("--------------- move opened tag up inside"),u(e,n.level)),e.level!==n.level&&m(n)&&n.node.previousSibling.contains(e.node)&&(N("--------------- move closed tag down inside"),a(n,e.level,e.node))}function l(e,n){N("closed tag is contained inside open"),x(n)&&!b(n.node.nextSibling)?(N("--------------- move closed tag up outside"),u(n,e.level)):m(n)&&!E(n.node.previousSibling)&&(N("--------------- move closed tag up inside"),s(n,e.level)),e.level!==n.level&&x(e)&&e.node.nextSibling.contains(n.node)&&(N("--------------- move opened tag down inside"),r(e,n.level,n.node))}function i(e,n){N("opening and closing tags are not in ancestor nodes of each other"),m(e)&&!E(e.node.previousSibling)?(N("--------------- move opened tag up outside"),s(e,n.level,n.node)):x(e)&&!E(e.node.nextSibling)&&(N("--------------- move opened tag up inside"),u(e,n.level,n.node)),x(n)&&!b(n.node.nextSibling)?(N("--------------- move closed tag up outside"),u(n,e.level,e.node)):m(n)&&!E(n.node.previousSibling)&&(N("--------------- move closed tag up inside"),s(n,e.level,e.node))}function r(e,n,o){for(var t=e.node.nextSibling;e.level<n&&t.contains(o);)e.level++,t=t.firstChild;e.node.nodeValue.length!==e.tag.length&&(p(e),h(e));var d=t.parentElement;d.insertBefore(e.node,d.firstChild)}function a(e,n,o){for(var t=e.node.previousSibling;e.level<n&&t.contains(o);)e.level++,t=t.lastChild;e.node.nodeValue.length!==e.tag.length&&(p(e),h(e)),t.parentElement.appendChild(e.node)}function s(e,n,o){var t=e.node;do e.level--,t=t.parentElement;while((e.level>n||o&&!t.parentElement.contains(o))&&!E(t.previousSibling));e.node.nodeValue.length!==e.tag.length&&(p(e),h(e)),t.parentElement.insertBefore(e.node,t)}function u(e,n,o){var t=e.node;do e.level--,t=t.parentElement;while((e.level>n||o&&!t.parentElement.contains(o))&&!b(t.nextSibling));e.node.nodeValue.length!==e.tag.length&&(p(e),h(e));var d=t.parentElement,l=t.nextSibling;l?d.insertBefore(e.node,l):d.appendChild(e.node)}function g(){for(var e=null;e=y.pop();)e.node.nodeValue=e.node.nodeValue.replace(e.placeholder,"")}function p(e){var n=e.node.nodeValue,o=e.tag.length,t="{#"+T("_",o-4)+"#}";e.node.nodeValue=n.substring(0,e.index)+t+n.substring(e.index+o),y.push({node:e.node,placeholder:t})}var c=o(0),f=o(2),v=o(1),h=f.updateTextNodeData,m=f.startsWithTag,x=f.endsWithTag,E=f.isDataElement,b=f.isFullDataElement,T=f.repeatString,N=(c.Node,v.log),y=[];e.exports={init:t,handleCaseClosedIsAncestor:d,handleCaseOpenedIsAncestor:l,handleCaseSeparateTrees:i,removePlaceholders:g}},function(e,n,o){function t(e){r.init(e),s=e.root}function d(e,n,o){var t=e.node,i=t.parentElement,r="both"===o?e.tag+n.tag:e.tag,a=!i||i===s||!i.parentElement||i.childNodes.length>1||!u[i.nodeName];if(!a){var g=r===t.nodeValue.trim();if(!g&&"both"===o){var p=t.nodeValue,c=p.substring(0,e.index)+p.substring(e.index+e.tag.length,n.index)+p.substring(n.index+n.tag.length);g=!c.trim().length}if(g&&(i.parentElement.replaceChild(t,i),e.level--,!t.parentElement.children.length)){var f=l(e,n,o);o=f?"both":o,d(e,n,o)}}}function l(e,n,o){for(var t=e.node,d=e.node,l="both"===o,i=[];;){if(t=t.previousSibling,!t||t.nodeType!==a.TEXT_NODE)break;if(t===n.node)l=!0,e.index+=t.nodeValue.length,e.node.nodeValue=t.nodeValue+e.node.nodeValue,n.node=e.node;else if(t.nodeValue.trim().length)break;i.push(t)}for(;;){if(d=d.nextSibling,!d||d.nodeType!==a.TEXT_NODE)break;if(d===n.node)l=!0,n.index+=e.node.nodeValue.length,e.node.nodeValue=e.node.nodeValue+d.nodeValue,n.node=e.node;else if(d.nodeValue.trim().length)break;i.push(d)}for(var r=e.node.parentElement,s=0;s<i.length;s++)r.removeChild(i[s]);return l}var i=o(0),r=o(1),a=i.Node,s=(r.log,null),u={P:1,DIV:1,SPAN:1,I:1,EM:1,STRONG:1,LI:1};e.exports={init:t,run:d}},function(e,n,o){function t(e){return o(d(e))}function d(e){var n=l[e];if(!(n+1))throw new Error("Cannot find module '"+e+"'.");return n}var l={"./debug":1,"./debug.js":1,"./dom-config":0,"./dom-config.js":0,"./env":3,"./env.js":3,"./extend-tags":4,"./extend-tags.js":4,"./fix-table-tags":5,"./fix-table-tags.js":5,"./improve-tags":6,"./improve-tags.js":6,"./move-tags":7,"./move-tags.js":7,"./replace-empty-node":8,"./replace-empty-node.js":8,"./utils":2,"./utils.js":2};t.keys=function(){return Object.keys(l)},t.resolve=d,e.exports=t,t.id=9},function(e,n,o){function t(e){return o(9)("./"+e)}function d(e,n){function o(e){for(var o=0;o<E.length;o++)E[o].lastIndex=0;S=e,C=[],O={},D=[],w=[],r.init(n),i.init(n),s.init(n),u.init(n),g.init(n),p.init(n),c.init(n)}function t(){a.isFrontEnd?(_=document,"string"==typeof e?(I=!0,j=document.createElement("div"),j.innerHTML=e):j=e):(_=f(e).defaultView.document,j=_.documentElement.lastChild,I=!0),n||(n={}),n.doc=_,n.root=j,n.regs=E}function d(){var e=0;l(j,e)}function l(e,n){if(e.nodeType===v.TEXT_NODE)return b(e,n);if(e.nodeType===v.ELEMENT_NODE){n++;for(var o=Array.prototype.slice.call(e.childNodes),t=0;t<o.length;t++)l(o[t],n)}}function b(e,n){if(e.nodeValue=e.nodeValue.trim(),!e.nodeValue.length&&e.parentElement)return void e.parentElement.removeChild(e);var o=e.nodeValue;for(E.tag.lastIndex=0;;){o.length!==e.nodeValue.length&&(E.tag.lastIndex-=o.length-e.nodeValue.length),o=e.nodeValue;var t=E.tag.exec(e.nodeValue);if(!t||!t[2].length&&"/"!==t[1])break;t[2]=t[2].replace(E.tagName,function(e){var n=e.substring(0,1);return'"'!==n&&"'"!==n?e.replace(E.spaces,""):e}),"/"!==t[1]?T(e,t,n):N(e,t,n)}}function T(e,n,o){var t=n[2],d={name:t,type:n[1],tag:n[0],node:e,index:n.index,level:o,openedKey:w.length};"undefined"==typeof O[t]&&(O[t]=[]),"2:improve"===S&&(d.improveKey=C.length,C.push({opened:d})),O[t].push(d),w.push(t),x("opened: ",t)}function N(e,n,o){var t=n[2],d={node:e,tag:n[0],index:n.index,level:o};if(!t.length&&w.length&&(t=w[w.length-1]),"undefined"==typeof O[t]||!t.length)return void D.push({closed:d});var l=O[t].pop();if(O[t].length||delete O[t],t!==w[w.length-1])x('remove wrong closed "'+t+'" from stack: ',w[l.openedKey]),w[l.openedKey]=null,D.push({opened:l,closed:d});else{do x("pop last element from opened stack: ",w[w.length-1]),w.pop();while(null===w[w.length-1]);x("closed: ",t),"1:tidy"===S?y({opened:l,closed:d}):"2:improve"===S?C[l.improveKey].closed=d:"3:fix-tables"===S&&p.run({opened:l,closed:d})}}function y(e){x("======= start tidy: ",e.opened.tag,e.closed.tag);var n=e.opened,o=e.closed;if(n.node!==o.node&&(s.run(n,o,"opened"),s.run(o,n,"closed")),n.node===o.node&&s.run(n,o,"both"),n.node.parentElement!==o.node.parentElement){var t=n.node.parentElement.compareDocumentPosition(o.node.parentElement);t&v.DOCUMENT_POSITION_CONTAINS?(u.handleCaseClosedIsAncestor(n,o),n.level!==o.level&&g.extendTagForward(n,o)):t&v.DOCUMENT_POSITION_CONTAINED_BY?(u.handleCaseOpenedIsAncestor(n,o),n.level!==o.level&&g.extendTagBack(n,o)):(u.handleCaseSeparateTrees(n,o),n.node.parentElement!==o.node.parentElement&&g.extendSeparatedTagParts(n,o))}u.removePlaceholders(),V(n,o)}function V(e,n){var o=null;if(e.node===n.node){o=e.node.nodeValue;var t=o.substring(e.index+e.tag.length,n.index);return void(t.trim().length||(e.node.nodeValue=o.substring(0,e.index)+o.substring(n.index+n.tag.length),e.node=n.node=null))}var d=e.node.parentElement,l=d&&e.node.nextSibling===n.node&&m(e)&&h(n);l&&(h(e)?d.removeChild(e.node):e.node.nodeValue=e.node.nodeValue.substring(0,e.index),m(n)?d.removeChild(n.node):n.node.nodeValue=n.node.nodeValue.substring(n.index+n.tag.length),e.node=n.node=null)}if("string"!=typeof e&&!(e instanceof v))return null;var S,C,O,D,w,_=null,j=null,I=!1;return t(),o("1:tidy"),d(),j instanceof v&&j.normalize(),o("2:improve"),d(),c.run(C),o("3:fix-tables"),d(),r.hideInvalidTags(O,D),r.logResult(j),I?j.innerHTML:null}var l=t("dom-config"),i=t("utils"),r=t("debug"),a=t("env"),s=t("replace-empty-node"),u=t("move-tags"),g=t("extend-tags"),p=t("fix-table-tags"),c=t("improve-tags"),f=l.jsdom,v=l.Node,h=(i.repeatString,i.startsWithTag),m=i.endsWithTag,x=r.log,E={spaces:new RegExp("\\s+","g"),tagName:new RegExp("(?:[^\"']+|\"[^\"]+\"|'[^']+')","g"),tag:new RegExp("\\{\\{\\s*([#^/])([^}]*)\\}\\}","g")};e.exports=d}]);
\ No newline at end of file
+var mustacheTidy=function(e){function n(o){if(t[o])return t[o].exports;var d=t[o]={i:o,l:!1,exports:{}};return e[o].call(d.exports,d,d.exports,n),d.l=!0,d.exports}var t={};return n.m=e,n.c=t,n.i=function(e){return e},n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:o})},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="",n(n.s=10)}([function(e,n,t){var o=t(3);if(o.isFrontEnd)e.exports={jsdom:null,Node:Node};else{var d=t(!function(){var e=new Error('Cannot find module "jsdom"');throw e.code="MODULE_NOT_FOUND",e}());d.defaultDocumentFeatures={FetchExternalResources:!1,ProcessExternalResources:!1};var l=t(!function(){var e=new Error('Cannot find module "jsdom/lib/jsdom/living/generated/Node.js"');throw e.code="MODULE_NOT_FOUND",e}());e.exports={jsdom:d.jsdom,Node:l.expose.Window.Node}}},function(e,n,t){function o(e){p=e}function d(){if(p.debug){if(a.isFrontEnd)return console.log.apply(console,arguments);for(var e=Array.prototype.slice.apply(arguments),n=0;n<e.length;n++)null!==e[n]&&"object"==typeof e[n]&&"undefined"!=typeof e[n].nodeType&&"undefined"!=typeof e[n].node&&(e[n].node&&"object"==typeof e[n].node&&e[n].node.nodeType===u.TEXT_NODE?e[n].node='"'+e[n].node.nodeValue+'"':e[n].nodeType===u.TEXT_NODE&&(e[n]='"'+e[n].nodeValue+'"'));console.log.apply(console,e)}}function l(e){function n(e,o){if(o||(o=0),e.nodeType===u.TEXT_NODE)return t(o)+e.nodeValue+"\n";if(e.nodeType!==u.ELEMENT_NODE)return"";var d=t(o),l=e.nodeName.toLowerCase(),i=d+"<"+l+">\n",r=e.childNodes;o++;for(var a=0;a<r.length;a++)i+=n(r[a],o);return i+d+"</"+l+">\n"}function t(e){return e?r(" ",4*e):""}if(p.debug){var o=n(e);d("result html: "),d(o)}}function i(e,n){function t(e){var n=e.node,t=n.nodeValue,o=e.index,l=e.tag.length;n.nodeValue=t.substring(0,o+1)+"#"+t.substr(o+2,l-4)+"#"+t.substring(o-1+l),d("replace ->",t,"<- with ->",n.nodeValue)}if(p.debug){var o=null;for(var l in e){o=e[l];for(var i=0;i<o.length;i++)t(o[i])}for(var i=0;i<n.length;i++)o=n[i],t(o.closed),o.opened&&t(o.opened)}}function r(e,n){return Array(1*n+1).join(e)}var a=t(3),s=t(0),u=s.Node;e.exports={init:o,log:d,logResult:l,hideInvalidTags:i};var p={}},function(e,n,t){function o(e){g.init(e),c=e.doc}function d(e,n){return Array(1*n+1).join(e)}function l(e,n){e.index=0,e.node=i(e.tag),"undefined"!=typeof n&&(e.level=n)}function i(e){return c.createTextNode(e)}function r(e){return 0===e.index||!e.node.nodeValue.substring(0,e.index).trim().length}function a(e){var n=e.node.nodeValue,t=e.index+e.tag.length;return n.length===t||!n.substring(t).trim().length}function s(e){return e&&e.nodeType!==f.COMMENT_NODE}function u(e){return!!s(e)&&(!(e.nodeType===f.TEXT_NODE&&!e.nodeValue.trim().length)||!!e.nextSibling&&u(e.nextSibling))}var p=t(0),g=t(1),c=null,f=(g.log,p.Node);e.exports={init:o,repeatString:d,updateTextNodeData:l,createTextNode:i,startsWithTag:r,endsWithTag:a,isDataElement:s,isFullDataElement:u}},function(e,n){e.exports={isFrontEnd:"undefined"!=typeof window}},function(e,n,t){function o(e){s.init(e),a.init(e)}function d(e,n){var t=e.node.parentElement.compareDocumentPosition(n.node.parentElement);t&f.DOCUMENT_POSITION_CONTAINS?l(e,n,!0):t&f.DOCUMENT_POSITION_CONTAINED_BY?i(e,n,!0):e.level>=n.level?(v("-------------- extend tag both ways starting from closed"),i(e,n,!0),l(e,n)):(v("-------------- extend tag both ways starting from opened"),l(e,n,!0),i(e,n))}function l(e,n,t){v("-------------- extend tag forward");var o=e.level,d=e.node,l=null;for(!e.node.nextSibling&&c(e)||(l=p(n.tag),e.node.parentElement.appendChild(l));;)if(o--,d=d.parentElement,d.nextSibling){if(u(e,o),d.parentElement.insertBefore(e.node,d.nextSibling),t?d.parentElement.contains(n.node):o<=n.level)break;l=p(n.tag),d.parentElement.appendChild(l)}}function i(e,n,t){v("-------------- extend tag back");var o=n.level,d=n.node.parentElement,l=null;for(!n.node.previousSibling&&g(n)||(l=p(e.tag),d.insertBefore(l,d.firstChild)),d=n.node;;)if(o--,d=d.parentElement,d.previousSibling){if(u(n,o),d.parentElement.insertBefore(n.node,d),t?d.parentElement.contains(e.node):o<=e.level)break;l=p(e.tag),d.parentElement.insertBefore(l,d.parentElement.firstChild)}}var r=t(0),a=t(2),s=t(1),u=a.updateTextNodeData,p=a.createTextNode,g=a.startsWithTag,c=a.endsWithTag,f=r.Node,v=s.log;e.exports={init:o,extendSeparatedTagParts:d,extendTagForward:l,extendTagBack:i}},function(e,n,t){function o(e){u.init(e),s.init(e)}function d(e){e.opened.node&&e.closed&&i(e.opened)&&(h("-- fix table tag: ",e),l(e.opened,e.closed))}function l(e,n){function t(o){if(o.nodeType===v.ELEMENT_NODE&&o.firstChild)if(x[o.nodeName])o.insertBefore(f(e.tag),o.firstChild),o.appendChild(f(n.tag));else for(var d=0;d<o.childNodes.length;d++)t(o.childNodes[d])}for(var o=e.node;;){if(o=o.nextSibling,o===n.node)break;t(o)}p(e)&&g(e)?e.node.parentElement.removeChild(e.node):r(e),p(n)&&g(n)?n.node.parentElement.removeChild(n.node):r(n)}function i(e){return e.node.parentElement&&!!m[e.node.parentElement.nodeName]}function r(e){var n=e.node.nodeValue;e.node.nodeValue=n.substring(0,e.index)+c(" ",e.tag.length)+n.substring(e.index+e.tag.length)}var a=t(0),s=t(2),u=t(1),p=s.startsWithTag,g=s.endsWithTag,c=s.repeatString,f=s.createTextNode,v=a.Node,h=u.log,m={TABLE:1,THEAD:1,TBODY:1,TR:1},x={TD:1,TH:1};e.exports={init:o,run:d,tableCells:x}},function(e,n,t){function o(e){c.init(e),g.init(e),E=e.root,y=e.regs.spaces,T={},N=[]}function d(e){b=e;for(var n=0;n<b.length;n++){var t=b[n];if(x("-- improve tag: ",t),t.opened.node&&t.closed){var o=l(t);if(o){var d=i(t,o);n=d-1}else r(t)&&n--}}for(var n=0;n<N.length;n++)N[n]&&(N[n].nodeValue=N[n].nodeValue.replace(y," ").trim())}function l(e){var n=T[e.opened.level];if(!n||!n.length)return null;var t=n.length-1;do{var o=n[t];t--}while((!o.opened.node||o===e)&&t>=0);var d=o.opened.node&&o.opened.name===e.opened.name&&o.opened.type===e.opened.type;if(!d)return null;var l=!1;if(e.opened.node.previousSibling===o.closed.node)l=v(e.opened)&&h(o.closed);else if(e.opened.node===o.closed.node){var i=o.closed.node.nodeValue.substring(o.closed.index,e.opened.index);l=i.trim().length===o.closed.tag.length}return l?o:null}function i(e,n){x("-- merge with:",n),v(e.opened)&&h(e.opened)?e.opened.node.parentElement.removeChild(e.opened.node):u(e.opened,!0),v(n.closed)&&h(n.closed)?n.closed.node.parentElement.removeChild(n.closed.node):u(n.closed,!0);for(var t in e.closed)n.closed[t]=e.closed[t];return e.opened.node=null,e.closed.node=null,n.opened.improveKey}function r(e){for(var n=e.opened.level;s(e);)a(e);var t=e.opened.level,o=n!==t;if(T[t]||(T[t]=[]),o){var d=T[n];if(d&&d.length){var l=d[d.length-1];l===e&&d.pop()}T[t].push(e)}else{var i=T[n].length,l=i?T[n][i-1]:null;l&&l===e||T[n].push(e)}return o}function a(e){var n=e.opened,t=e.closed,o=n.node.parentElement,d=o.parentElement;h(n)||u(n),d.insertBefore(n.node,o),v(t)||u(t),o.nextSibling?d.insertBefore(t.node,o.nextSibling):d.appendChild(t.node),n.level--,t.level--}function s(e){var n=e.opened,t=e.closed,o=n.node.parentElement;return o&&o!==E&&o.parentElement&&v(n)&&h(t)&&!n.node.previousSibling&&!t.node.nextSibling}function u(e,n){var t=e.node.nodeValue;e.node.nodeValue=t.substring(0,e.index)+m(" ",e.tag.length)+t.substring(e.index+e.tag.length),N.push(e.node),n||f(e)}var p=t(0),g=t(2),c=t(1),f=(p.Node,g.updateTextNodeData),v=g.startsWithTag,h=g.endsWithTag,m=g.repeatString,x=c.log,E=null,b=[],T={},N=[],y=null;e.exports={init:o,run:d}},function(e,n,t){function o(e){v.init(e),f.init(e),y=[]}function d(e,n){N("closing tag is in ancestor node of opening tag"),m(e)&&!E(e.node.previousSibling)?(N("--------------- move opened tag up outside"),s(e,n.level)):x(e)&&!E(e.node.nextSibling)&&(N("--------------- move opened tag up inside"),u(e,n.level)),e.level!==n.level&&m(n)&&n.node.previousSibling.contains(e.node)&&(N("--------------- move closed tag down inside"),a(n,e.level,e.node))}function l(e,n){N("closed tag is contained inside open"),x(n)&&!b(n.node.nextSibling)?(N("--------------- move closed tag up outside"),u(n,e.level)):m(n)&&!E(n.node.previousSibling)&&(N("--------------- move closed tag up inside"),s(n,e.level)),e.level!==n.level&&x(e)&&e.node.nextSibling.contains(n.node)&&(N("--------------- move opened tag down inside"),r(e,n.level,n.node))}function i(e,n){N("opening and closing tags are not in ancestor nodes of each other"),m(e)&&!E(e.node.previousSibling)?(N("--------------- move opened tag up outside"),s(e,n.level,n.node)):x(e)&&!E(e.node.nextSibling)&&(N("--------------- move opened tag up inside"),u(e,n.level,n.node)),x(n)&&!b(n.node.nextSibling)?(N("--------------- move closed tag up outside"),u(n,e.level,e.node)):m(n)&&!E(n.node.previousSibling)&&(N("--------------- move closed tag up inside"),s(n,e.level,e.node))}function r(e,n,t){for(var o=e.node.nextSibling;e.level<n&&o.contains(t);)e.level++,o=o.firstChild;e.node.nodeValue.length!==e.tag.length&&(g(e),h(e));var d=o.parentElement;d.insertBefore(e.node,d.firstChild)}function a(e,n,t){for(var o=e.node.previousSibling;e.level<n&&o.contains(t);)e.level++,o=o.lastChild;e.node.nodeValue.length!==e.tag.length&&(g(e),h(e)),o.parentElement.appendChild(e.node)}function s(e,n,t){var o=e.node;do e.level--,o=o.parentElement;while((e.level>n||t&&!o.parentElement.contains(t))&&!E(o.previousSibling));e.node.nodeValue.length!==e.tag.length&&(g(e),h(e)),o.parentElement.insertBefore(e.node,o)}function u(e,n,t){var o=e.node;do e.level--,o=o.parentElement;while((e.level>n||t&&!o.parentElement.contains(t))&&!b(o.nextSibling));e.node.nodeValue.length!==e.tag.length&&(g(e),h(e));var d=o.parentElement,l=o.nextSibling;l?d.insertBefore(e.node,l):d.appendChild(e.node)}function p(){for(var e=null;e=y.pop();)e.node.nodeValue=e.node.nodeValue.replace(e.placeholder,"")}function g(e){var n=e.node.nodeValue,t=e.tag.length,o="{#"+T("_",t-4)+"#}";e.node.nodeValue=n.substring(0,e.index)+o+n.substring(e.index+t),y.push({node:e.node,placeholder:o})}var c=t(0),f=t(2),v=t(1),h=f.updateTextNodeData,m=f.startsWithTag,x=f.endsWithTag,E=f.isDataElement,b=f.isFullDataElement,T=f.repeatString,N=(c.Node,v.log),y=[];e.exports={init:o,handleCaseClosedIsAncestor:d,handleCaseOpenedIsAncestor:l,handleCaseSeparateTrees:i,removePlaceholders:p}},function(e,n,t){function o(e){r.init(e),s=e.root}function d(e,n,t){var o=e.node,i=o.parentElement,r="both"===t?e.tag+n.tag:e.tag,a=!i||i===s||!i.parentElement||i.childNodes.length>1||!u[i.nodeName];if(!a){var p=r===o.nodeValue.trim();if(!p&&"both"===t){var g=o.nodeValue,c=g.substring(0,e.index)+g.substring(e.index+e.tag.length,n.index)+g.substring(n.index+n.tag.length);p=!c.trim().length}if(p&&(i.parentElement.replaceChild(o,i),e.level--,!o.parentElement.children.length)){var f=l(e,n,t);t=f?"both":t,d(e,n,t)}}}function l(e,n,t){for(var o=e.node,d=e.node,l="both"===t,i=[];;){if(o=o.previousSibling,!o||o.nodeType!==a.TEXT_NODE)break;if(o===n.node)l=!0,e.index+=o.nodeValue.length,e.node.nodeValue=o.nodeValue+e.node.nodeValue,n.node=e.node;else if(o.nodeValue.trim().length)break;i.push(o)}for(;;){if(d=d.nextSibling,!d||d.nodeType!==a.TEXT_NODE)break;if(d===n.node)l=!0,n.index+=e.node.nodeValue.length,e.node.nodeValue=e.node.nodeValue+d.nodeValue,n.node=e.node;else if(d.nodeValue.trim().length)break;i.push(d)}for(var r=e.node.parentElement,s=0;s<i.length;s++)r.removeChild(i[s]);return l}var i=t(0),r=t(1),a=i.Node,s=(r.log,null),u={P:1,DIV:1,SPAN:1,I:1,EM:1,STRONG:1,LI:1};e.exports={init:o,run:d}},function(e,n,t){function o(e){return t(d(e))}function d(e){var n=l[e];if(!(n+1))throw new Error("Cannot find module '"+e+"'.");return n}var l={"./debug":1,"./debug.js":1,"./dom-config":0,"./dom-config.js":0,"./env":3,"./env.js":3,"./extend-tags":4,"./extend-tags.js":4,"./fix-table-tags":5,"./fix-table-tags.js":5,"./improve-tags":6,"./improve-tags.js":6,"./move-tags":7,"./move-tags.js":7,"./replace-empty-node":8,"./replace-empty-node.js":8,"./utils":2,"./utils.js":2};o.keys=function(){return Object.keys(l)},o.resolve=d,e.exports=o,o.id=9},function(e,n,t){function o(e){return t(9)("./"+e)}function d(e,n){function t(e){for(var t=0;t<E.length;t++)E[t].lastIndex=0;C=e,O=[],D={},w=[],_=[],r.init(n),i.init(n),s.init(n),u.init(n),p.init(n),g.init(n),c.init(n)}function o(){a.isFrontEnd?(j=document,"string"==typeof e?(B=!0,I=document.createElement("div"),I.innerHTML=e):I=e):(j=f(e).defaultView.document,I=j.documentElement.lastChild,B=!0),n||(n={}),n.doc=j,n.root=I,n.regs=E}function d(){var e=0;l(I,e)}function l(e,n){if(e.nodeType===v.TEXT_NODE)return b(e,n);if(e.nodeType===v.ELEMENT_NODE){n++;for(var t=Array.prototype.slice.call(e.childNodes),o=0;o<t.length;o++)l(t[o],n)}}function b(e,n){if(e.nodeValue=V(e.nodeValue),!e.nodeValue.length&&e.parentElement)return void e.parentElement.removeChild(e);var t=e.nodeValue;for(E.tag.lastIndex=0;;){t.length!==e.nodeValue.length&&(E.tag.lastIndex-=t.length-e.nodeValue.length),t=e.nodeValue;var o=E.tag.exec(e.nodeValue);if(!o||!o[2].length&&"/"!==o[1])break;o[2]=o[2].replace(E.tagName,function(e){var n=e.substring(0,1);return'"'!==n&&"'"!==n?e.replace(E.spaces,""):e}),"/"!==o[1]?T(e,o,n):N(e,o,n)}}function T(e,n,t){var o=n[2],d={name:o,type:n[1],tag:n[0],node:e,index:n.index,level:t,openedKey:_.length};"undefined"==typeof D[o]&&(D[o]=[]),"2:improve"===C&&(d.improveKey=O.length,O.push({opened:d})),D[o].push(d),_.push(o),x("opened: ",o)}function N(e,n,t){var o=n[2],d={node:e,tag:n[0],index:n.index,level:t};if(!o.length&&_.length&&(o=_[_.length-1]),"undefined"==typeof D[o]||!o.length)return void w.push({closed:d});var l=D[o].pop();if(D[o].length||delete D[o],o!==_[_.length-1])x('remove wrong closed "'+o+'" from stack: ',_[l.openedKey]),_[l.openedKey]=null,w.push({opened:l,closed:d});else{do x("pop last element from opened stack: ",_[_.length-1]),_.pop();while(null===_[_.length-1]);x("closed: ",o),"1:tidy"===C?y({opened:l,closed:d}):"2:improve"===C?O[l.improveKey].closed=d:"3:fix-tables"===C&&g.run({opened:l,closed:d})}}function y(e){x("======= start tidy: ",e.opened.tag,e.closed.tag);var n=e.opened,t=e.closed;if(n.node!==t.node&&(s.run(n,t,"opened"),s.run(t,n,"closed")),n.node===t.node&&s.run(n,t,"both"),n.node.parentElement!==t.node.parentElement){var o=n.node.parentElement.compareDocumentPosition(t.node.parentElement);o&v.DOCUMENT_POSITION_CONTAINS?(u.handleCaseClosedIsAncestor(n,t),n.level!==t.level&&p.extendTagForward(n,t)):o&v.DOCUMENT_POSITION_CONTAINED_BY?(u.handleCaseOpenedIsAncestor(n,t),n.level!==t.level&&p.extendTagBack(n,t)):(u.handleCaseSeparateTrees(n,t),n.node.parentElement!==t.node.parentElement&&p.extendSeparatedTagParts(n,t))}u.removePlaceholders(),S(n,t)}function S(e,n){var t=null;if(e.node===n.node){t=e.node.nodeValue;var o=t.substring(e.index+e.tag.length,n.index);return void(o.trim().length||(e.node.nodeValue=t.substring(0,e.index)+t.substring(n.index+n.tag.length),e.node=n.node=null))}var d=e.node.parentElement,l=d&&e.node.nextSibling===n.node&&m(e)&&h(n);l&&(h(e)?d.removeChild(e.node):e.node.nodeValue=e.node.nodeValue.substring(0,e.index),m(n)?d.removeChild(n.node):n.node.nodeValue=n.node.nodeValue.substring(n.index+n.tag.length),e.node=n.node=null)}function V(e){var n=!!E.startSpaces.exec(e),t=!!E.endSpaces.exec(e);return e=e.trim(),e.length?(n&&(e=" "+e),t&&(e+=" "),e):""}if("string"!=typeof e&&!(e instanceof v))return null;var C,O,D,w,_,j=null,I=null,B=!1;return o(),t("1:tidy"),d(),I instanceof v&&I.normalize(),t("2:improve"),d(),c.run(O),t("3:fix-tables"),d(),r.hideInvalidTags(D,w),r.logResult(I),B?I.innerHTML:null}var l=o("dom-config"),i=o("utils"),r=o("debug"),a=o("env"),s=o("replace-empty-node"),u=o("move-tags"),p=o("extend-tags"),g=o("fix-table-tags"),c=o("improve-tags"),f=l.jsdom,v=l.Node,h=(i.repeatString,i.startsWithTag),m=i.endsWithTag,x=r.log,E={spaces:new RegExp("\\s+","g"),startSpaces:new RegExp("^\\s* "),endSpaces:new RegExp(" \\s*$"),tagName:new RegExp("(?:[^\"']+|\"[^\"]+\"|'[^']+')","g"),tag:new RegExp("\\{\\{\\s*([#^/])([^}]*)\\}\\}","g")};e.exports=d}]);
\ No newline at end of file
diff --git a/index.js b/index.js
index bd23fe8..70f01ea 100644
--- a/index.js
+++ b/index.js
@@ -19,6 +19,8 @@ var endsWithTag = utils.endsWithTag;
 var log = debug.log;
 var regs = {
     spaces: new RegExp('\\s+', 'g'),
+    startSpaces: new RegExp('^\\s* '),
+    endSpaces: new RegExp(' \\s*$'),
     tagName: new RegExp('(?:[^"\']+|"[^"]+"|\'[^\']+\')', 'g'),
     tag: new RegExp('\\{\\{\\s*([#^/])([^}]*)\\}\\}', 'g')
 };
@@ -132,7 +134,7 @@ function mustacheTidy(html, options) {
 
     // Perform tidy on single text DOM node
     function tidyTextNode(node, level) {
-        node.nodeValue = node.nodeValue.trim();
+        node.nodeValue = smartTrim(node.nodeValue);
 
         // Remove empty text nodes
         if (!node.nodeValue.length && node.parentElement) {
@@ -319,4 +321,18 @@ function mustacheTidy(html, options) {
 
         opened.node = closed.node = null;
     }
+
+    // Trim text, leaving single start and ending spaces
+    function smartTrim(text) {
+        var hasStartSpace = !!regs.startSpaces.exec(text);
+        var hasEndSpace = !!regs.endSpaces.exec(text);
+
+        text = text.trim();
+        if (!text.length) return '';
+
+        if (hasStartSpace) text = ' ' + text;
+        if (hasEndSpace) text = text + ' ';
+
+        return text;
+    }
 }
diff --git a/spec/base-spec.js b/spec/base-spec.js
index 108ebca..c88443c 100644
--- a/spec/base-spec.js
+++ b/spec/base-spec.js
@@ -9,7 +9,7 @@ describe('Basic html processing', function() {
         `;
 
         var result = tidy(input);
-        expect(result).toBe('<div>Data</div>');
+        expect(result).toBe('<div> Data </div>');
     });
 
     it('should not handle single opening tag', function() {
@@ -20,7 +20,7 @@ describe('Basic html processing', function() {
         `;
 
         var result = tidy(input);
-        expect(result).toBe('<div>{{#tag}}</div>');
+        expect(result).toBe('<div> {{#tag}} </div>');
     });
 
     it('should not handle single closing tag', function() {
@@ -31,7 +31,7 @@ describe('Basic html processing', function() {
         `;
 
         var result = tidy(input);
-        expect(result).toBe('<div>{{/tag}}</div>');
+        expect(result).toBe('<div> {{/tag}} </div>');
     });
 
     it('should correctly handle input edge cases', function() {
@@ -71,4 +71,35 @@ describe('Basic html processing', function() {
         result = tidy(input);
         expect(result).toBe('data');
     });
+
+    it('should correctly handle &nbsp; tags', function() {
+        var input = `
+            <div>
+                {{ foo&nbsp; }}
+                <p>
+                    <span>Data</span>
+                    {{ &nbsp;#bar&nbsp; }}
+                    <span>Data</span>
+                </p>
+                <span>Data</span>
+                {{&nbsp;/bar&nbsp;}}
+            </div>
+        `;
+
+        var result = tidy(input);
+        expect(result).toBe(
+            '<div>' +
+                ' {{ foo&nbsp; }} ' +
+                '<p>' +
+                    '<span>Data</span>' +
+                    ' {{ &nbsp;#bar&nbsp; }} ' +
+                    '<span>Data</span>' +
+                    '{{&nbsp;/bar&nbsp;}}' +
+                '</p>' +
+                '{{ &nbsp;#bar&nbsp; }}' +
+                '<span>Data</span>' +
+                ' {{&nbsp;/bar&nbsp;}} ' +
+            '</div>'
+        );
+    });
 });
diff --git a/spec/extend-tags-spec.js b/spec/extend-tags-spec.js
index 12281cc..8cfe478 100644
--- a/spec/extend-tags-spec.js
+++ b/spec/extend-tags-spec.js
@@ -27,7 +27,7 @@ describe('Extending tags', function() {
                 '<div>' +
                     '<div>' +
                         '<div>' +
-                            'Data{{#tag}}Data' +
+                            ' Data{{#tag}}Data ' +
                             '{{/tag}}' +
                         '</div>' +
                         '{{#tag}}' +
@@ -43,7 +43,7 @@ describe('Extending tags', function() {
                 '{{#tag}}' +
                 '<span>Data</span>' +
                 '<span>Data</span>' +
-                '{{/tag}}' +
+                ' {{/tag}} ' +
             '</div>'
         );
     });
@@ -71,7 +71,7 @@ describe('Extending tags', function() {
         var result = tidy(input);
         expect(result).toBe(
             '<div>' +
-                '{{#tag}}' +
+                ' {{#tag}} ' +
                 '<span>Data</span>' +
                 '<span>Data</span>' +
                 '{{/tag}}' +
@@ -87,7 +87,7 @@ describe('Extending tags', function() {
                         '{{/tag}}' +
                         '<div>' +
                             '{{#tag}}' +
-                            'Data{{/tag}}Data' +
+                            ' Data{{/tag}}Data ' +
                         '</div>' +
                     '</div>' +
                 '</div>' +
@@ -131,7 +131,7 @@ describe('Extending tags', function() {
                 '<div>' +
                     '<div>' +
                         '<div>' +
-                            'Data{{#tag}}Data' +
+                            ' Data{{#tag}}Data ' +
                             '{{/tag}}' +
                         '</div>' +
                         '{{#tag}}' +
@@ -160,7 +160,7 @@ describe('Extending tags', function() {
                         '{{/tag}}' +
                         '<div>' +
                             '{{#tag}}' +
-                            'Data{{/tag}}Data' +
+                            ' Data{{/tag}}Data ' +
                         '</div>' +
                     '</div>' +
                 '</div>' +
@@ -202,7 +202,7 @@ describe('Extending tags', function() {
                 '<div>' +
                     '<div>' +
                         '<div>' +
-                            'Data{{#tag}}Data' +
+                            ' Data{{#tag}}Data ' +
                             '{{/tag}}' +
                         '</div>' +
                         '{{#tag}}' +
@@ -227,7 +227,7 @@ describe('Extending tags', function() {
                         '{{/tag}}' +
                         '<div>' +
                             '{{#tag}}' +
-                            'Data{{/tag}}Data' +
+                            ' Data{{/tag}}Data ' +
                         '</div>' +
                     '</div>' +
                 '</div>' +
diff --git a/spec/fix-table-tags-spec.js b/spec/fix-table-tags-spec.js
index 390cec3..963d17e 100644
--- a/spec/fix-table-tags-spec.js
+++ b/spec/fix-table-tags-spec.js
@@ -1,6 +1,6 @@
 var tidy = require('../');
 
-describe('Extending tags', function() {
+describe('Fixing table tags', function() {
     it('should fix table tags, when opening tag is out of table, and closing is inside table', function() {
         var input = `
             {{^tag}}
@@ -37,7 +37,7 @@ describe('Extending tags', function() {
 
         var result = tidy(input);
         expect(result).toBe(
-            '{{^tag}}' +
+            '{{^tag}} ' +
             '<div>Data</div>' +
             '<div>Data</div>' +
             '{{/tag}}' +
@@ -141,7 +141,7 @@ describe('Extending tags', function() {
             '{{^tag}}' +
             '<div>Data</div>' +
             '<div>Data</div>' +
-            '{{/tag}}'
+            ' {{/tag}} '
         );
     });
 
@@ -191,7 +191,7 @@ describe('Extending tags', function() {
                         '<th>Data</th>' +
                         '<th>' +
                             '<span>' +
-                                'Data' +
+                                ' Data ' +
                                 '{{^tag}}' +
                                 '<em>Data</em>' +
                                 '{{/tag}}' +
diff --git a/spec/improve-tags-spec.js b/spec/improve-tags-spec.js
index 29d0792..3c1b67b 100644
--- a/spec/improve-tags-spec.js
+++ b/spec/improve-tags-spec.js
@@ -24,7 +24,7 @@ describe('Improving tags', function() {
         var result = tidy(input);
         expect(result).toBe(
             '<div>' +
-                '{{^outer}}' +
+                ' {{^outer}} ' +
                 '{{#foo}}' +
                 '{{^bar}}' +
                 '{{#tag}}' +
@@ -38,8 +38,8 @@ describe('Improving tags', function() {
                 '{{/tag}}' +
                 '{{/}}' +
                 '{{/foo}}' +
-                '{{/}}' +
-                'Data' +
+                ' {{/}} ' +
+                ' Data ' +
             '</div>'
         );
     });
@@ -71,7 +71,7 @@ describe('Improving tags', function() {
                     '</div>' +
                 '</div>' +
                 '{{/tag}}' +
-                'Data' +
+                ' Data ' +
             '</div>'
         );
     });
@@ -140,7 +140,7 @@ describe('Improving tags', function() {
             '<div>' +
                 '<div>' +
                     '<div>' +
-                        '{{^tag}}Data 1{{/tag}}{{#tag}}Data 2{{/tag}}' +
+                        ' {{^tag}}Data 1{{/tag}}{{#tag}}Data 2{{/tag}} ' +
                     '</div>' +
                 '</div>' +
             '</div>'
@@ -163,7 +163,7 @@ describe('Improving tags', function() {
             '<div>' +
                 '<div>' +
                     '<div>' +
-                        '{{#tag}}Data 1{{/tag}}{{#foo}}Data 2{{/foo}}' +
+                        ' {{#tag}}Data 1{{/tag}}{{#foo}}Data 2{{/foo}} ' +
                     '</div>' +
                 '</div>' +
             '</div>'
diff --git a/spec/move-tags-spec.js b/spec/move-tags-spec.js
index 28da776..17d4f20 100644
--- a/spec/move-tags-spec.js
+++ b/spec/move-tags-spec.js
@@ -23,7 +23,7 @@ describe('Moving tags', function() {
                     '</div>' +
                 '</div>' +
             '</div>' +
-            '{{/tag}}'
+            ' {{/tag}} '
         );
     });
 
@@ -41,7 +41,7 @@ describe('Moving tags', function() {
 
         var result = tidy(input);
         expect(result).toBe(
-            '{{#tag}}' +
+            ' {{#tag}} ' +
             '<div>' +
                 '<div>' +
                     '<div>' +
@@ -70,7 +70,7 @@ describe('Moving tags', function() {
         expect(result).toBe(
             '<div>' +
                 '<div>' +
-                    'Data{{#tag}}' +
+                    ' Data {{#tag}}' +
                     '<div>' +
                         '<p>Data</p>' +
                     '</div>' +
@@ -101,7 +101,7 @@ describe('Moving tags', function() {
                     '<div>' +
                         '<p>Data</p>' +
                     '</div>' +
-                    '{{/tag}}Data' +
+                    '{{/tag}} Data ' +
                 '</div>' +
             '</div>'
         );
@@ -168,7 +168,7 @@ describe('Moving tags', function() {
                     '</div>' +
                 '</div>' +
                 '{{#tag}}' +
-                'Data' +
+                ' Data ' +
                 '{{/tag}}' +
                 '<div>' +
                     '<div>' +
diff --git a/spec/replace-empty-node-spec.js b/spec/replace-empty-node-spec.js
index c2fc5d5..47681cd 100644
--- a/spec/replace-empty-node-spec.js
+++ b/spec/replace-empty-node-spec.js
@@ -24,7 +24,7 @@ describe('Replacing empty dom nodes with containing tags', function() {
         `;
 
         var result = tidy(input);
-        expect(result).toBe('{{#tag}}Data{{/tag}}');
+        expect(result).toBe(' {{#tag}}  Data{{/tag}} ');
     });
 
     it('should recursively replace nodes for closing tag', function() {
@@ -39,7 +39,7 @@ describe('Replacing empty dom nodes with containing tags', function() {
             </div>
         `;
         var result = tidy(input);
-        expect(result).toBe('{{#tag}}Data{{/tag}}');
+        expect(result).toBe('{{#tag}}Data  {{/tag}} ');
     });
 
     it('should recursively replace nodes for opening and closing tags', function() {
@@ -62,7 +62,7 @@ describe('Replacing empty dom nodes with containing tags', function() {
         `;
 
         var result = tidy(input);
-        expect(result).toBe('{{#tag}}Data{{/tag}}');
+        expect(result).toBe(' {{#tag}}  Data  {{/tag}} ');
     });
 
     it('should recursively replace nodes for opening tag, and then remove tags as empty', function() {
@@ -75,16 +75,16 @@ describe('Replacing empty dom nodes with containing tags', function() {
                     </p>
                 </div>
             </div>
-            {{/tag}} Data
+            {{/tag}}Data
         `;
 
         var result = tidy(input);
-        expect(result).toBe('Data Data');
+        expect(result).toBe('Data  Data ');
     });
 
     it('should recursively replace nodes for closing tag, and then remove tags as empty', function() {
         var input = `
-            Data {{#tag}}
+            Data{{#tag}}
             <div>
                 <div>
                     <p>
@@ -95,7 +95,7 @@ describe('Replacing empty dom nodes with containing tags', function() {
             Data
         `;
         var result = tidy(input);
-        expect(result).toBe('Data Data');
+        expect(result).toBe('Data  Data ');
     });
 
     it('should recursively replace nodes for opening and closing tags, and then remove tags as empty', function() {
@@ -178,7 +178,7 @@ describe('Replacing empty dom nodes with containing tags', function() {
         `;
 
         var result = tidy(input);
-        expect(result).toBe('<div>Data</div>');
+        expect(result).toBe('<div> Data </div>');
     });
 
     it('should replace tag nodes, if tags data is in separate node', function() {
@@ -213,7 +213,7 @@ describe('Replacing empty dom nodes with containing tags', function() {
         `;
 
         var result = tidy(input);
-        expect(result).toBe('<div>{{#tag}}</div>');
+        expect(result).toBe('<div> {{#tag}} </div>');
     });
 
     it('should not replace single closing tag node', function() {
@@ -224,7 +224,7 @@ describe('Replacing empty dom nodes with containing tags', function() {
         `;
 
         var result = tidy(input);
-        expect(result).toBe('<div>{{/tag}}</div>');
+        expect(result).toBe('<div> {{/tag}} </div>');
     });
 
     it('should not replace nodes for wrongly closing tag', function() {
@@ -244,7 +244,7 @@ describe('Replacing empty dom nodes with containing tags', function() {
         `;
 
         var result = tidy(input);
-        expect(result).toBe('<div>{{#tag}}</div>{{#tag2}}<div>{{/tag}}</div>{{/tag2}}');
+        expect(result).toBe('<div> {{#tag}} </div> {{#tag2}} <div> {{/tag}} </div> {{/tag2}} ');
     });
 
     it('should not replace opening tag node with data', function() {
@@ -258,7 +258,7 @@ describe('Replacing empty dom nodes with containing tags', function() {
         `;
 
         var result = tidy(input);
-        expect(result).toBe('{{#tag}}<div>Data</div>{{/tag}}');
+        expect(result).toBe('{{#tag}}<div> Data </div> {{/tag}} ');
     });
 
     it('should not replace closing tag node with data', function() {
@@ -272,7 +272,7 @@ describe('Replacing empty dom nodes with containing tags', function() {
         `;
 
         var result = tidy(input);
-        expect(result).toBe('{{#tag}}<div>Data</div>{{/tag}}');
+        expect(result).toBe(' {{#tag}} <div> Data </div>{{/tag}}');
     });
 
     it('should not replace tags node with outer following data, but should remove tags as empty', function() {
@@ -283,7 +283,7 @@ describe('Replacing empty dom nodes with containing tags', function() {
         `;
 
         var result = tidy(input);
-        expect(result).toBe('<div>Data</div>');
+        expect(result).toBe('<div> Data </div>');
     });
 
     it('should not replace tags node with outer preciding data, but should remove tags as empty', function() {
@@ -294,7 +294,7 @@ describe('Replacing empty dom nodes with containing tags', function() {
         `;
 
         var result = tidy(input);
-        expect(result).toBe('<div>Data</div>');
+        expect(result).toBe('<div> Data </div>');
     });
 
     it('should recursively replace both tags nodes and root nodes untill common ancestor, if closing tag has shorthand form', function() {
@@ -347,6 +347,6 @@ describe('Replacing empty dom nodes with containing tags', function() {
         `;
 
         var result = tidy(input);
-        expect(result).toBe('{{#tag}}<a href="#"></a>{{/tag}}');
+        expect(result).toBe('{{#tag}}<a href="#"></a> {{/tag}} ');
     });
 });