diff --git a/dist/moon.js b/dist/moon.js
index 7873a48d..9280fa53 100644
--- a/dist/moon.js
+++ b/dist/moon.js
@@ -1085,28 +1085,23 @@
     
       var endOfText = input.substring(current).search(tagOrCommentStartRE);
     
-      // Only Text
       if (endOfText === -1) {
+        // Only Text
         state.tokens.push({
           type: "text",
           value: input.slice(current)
         });
         state.current = len;
         return;
+      } else if (endOfText !== 0) {
+        // End of Text Found
+        endOfText += current;
+        state.tokens.push({
+          type: "text",
+          value: input.slice(current, endOfText)
+        });
+        state.current = endOfText;
       }
-    
-      // No Text at All
-      if (endOfText === 0) {
-        return;
-      }
-    
-      // End of Text Found
-      endOfText += current;
-      state.tokens.push({
-        type: "text",
-        value: input.slice(current, endOfText)
-      });
-      state.current = endOfText;
     };
     
     var lexComment = function (state) {
@@ -1118,22 +1113,21 @@
     
       var endOfComment = input.indexOf("-->", current);
     
-      // Only an unclosed comment
       if (endOfComment === -1) {
+        // Only an unclosed comment
         state.tokens.push({
           type: "comment",
           value: input.slice(current)
         });
         state.current = len;
-        return;
+      } else {
+        // End of Comment Found
+        state.tokens.push({
+          type: "comment",
+          value: input.slice(current, endOfComment)
+        });
+        state.current = endOfComment + 3;
       }
-    
-      // End of Comment Found
-      state.tokens.push({
-        type: "comment",
-        value: input.slice(current, endOfComment)
-      });
-      state.current = endOfComment + 3;
     };
     
     var lexTag = function (state) {
@@ -1210,7 +1204,7 @@
           break;
         }
     
-        // If there is a space, the attribute ended
+        // If there is a space, skip
         if (char === " ") {
           incrementChar();
           continue;
@@ -1221,11 +1215,11 @@
         var noValue = false;
     
         while (current < len && char !== "=") {
-          if (char !== " " && char !== ">" && char !== "/" && nextChar !== ">") {
-            attrName += char;
-          } else {
+          if (char === " " || char === ">" || char === "/" && nextChar === ">") {
             noValue = true;
             break;
+          } else {
+            attrName += char;
           }
           incrementChar();
         }
@@ -1236,7 +1230,7 @@
           meta: {}
         };
     
-        if (noValue) {
+        if (noValue === true) {
           attributes[attrName] = attrValue;
           continue;
         }
diff --git a/dist/moon.min.js b/dist/moon.min.js
index 6e0016b9..86b0083d 100644
--- a/dist/moon.min.js
+++ b/dist/moon.min.js
@@ -4,4 +4,4 @@
  * Released under the MIT License
  * http://moonjs.ga
  */
-!function(e,t){"object"==typeof module&&module.exports?module.exports=t():e.Moon=t()}(this,function(){"use strict";function e(e){this.instance=e,this.cache={},this.setters={},this.clear={},this.target=null,this.map={}}function t(t){void 0===t&&(t={}),this.$options=t;var r=this;this.$id=a++,y(this,"$name",t.name,"root");var n=t.data;this.$data=void 0===n?{}:"function"==typeof n?n():n,y(this,"$render",t.render,k),y(this,"$hooks",t.hooks,{});var i=t.methods;void 0!==i&&s(r,i),this.$events={},this.$dom={},this.$observer=new e(this),this.$destroyed=!0,this.$queued=!1;var o=t.computed;void 0!==o&&l(this,o),this.init()}var r={},n={},i={},o={stop:"event.stopPropagation();",prevent:"event.preventDefault();",ctrl:"if(!event.ctrlKey) {return;};",shift:"if(!event.shiftKey) {return;};",alt:"if(!event.altKey) {return;};",enter:"if(event.keyCode !== 13) {return;};"},a=0,s=function(e,t){for(var r in t)!function(t,r){e.$data[t]=function(){return r.apply(e,arguments)}}(r,t[r])},l=function(e,t){for(var r in t)!function(r){var n=e.$observer;n.observe(r),Object.defineProperty(e.$data,r,{get:function(){var i=null;return void 0===n.cache[r]?(n.target=r,i=t[r].get.call(e),n.target=null,n.cache[r]=i):i=n.cache[r],i},set:k});var i=null;void 0!==(i=t[r].set)&&(n.setters[r]=i)}(r)};e.prototype.observe=function(e){var t=this;this.clear[e]=function(){t.cache[e]=void 0}},e.prototype.notify=function(e,t){var r=null;if(void 0!==(r=this.map[e]))for(var n=0;n<r.length;n++)this.notify(r[n]);var i=null;void 0!==(i=this.clear[e])&&i()};var u=function(e){!1===t.config.silent&&console.log(e)},c=function(e){!1===t.config.silent&&console.error("[Moon] ERR: "+e)},v=function(e){!1===e.$queued&&!1===e.$destroyed&&(e.$queued=!0,setTimeout(function(){e.build(),$(e,"updated"),e.$queued=!1},0))},f=function(){return{shouldRender:!1,eventListeners:{}}},p=function(e){return e.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\n/g,"\\n")},d=function(e,t,r,n){r=r.replace(/\[(\w+)\]/g,".$1");for(var i=r.split("."),o=0;o<i.length-1;o++){t=t[i[o]]}return t[i[o]]=n,i[0]},h=function(e){var t={};if(t.default=[],0===e.length)return t;for(var r=0;r<e.length;r++){var n=e[r],i=n.props.attrs,o="";void 0!==(o=i.slot)?(void 0===t[o]?t[o]=[n]:t[o].push(n),delete i.slot):t.default.push(n)}return t},m=function(e,t){for(var r in t)e[r]=t[r];return e},g=function(e,t){var r={};for(var n in e)r[n]=e[n];for(var n in t)r[n]=t[n];return r},y=function(e,t,r,n){e[t]=void 0===r?n:r},$=function(e,t){var r=e.$hooks[t];void 0!==r&&r.call(e)},b=function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},k=function(){},x=function(e){for(var t={},r=e.attributes,n=r.length;n--;)t[r[n].name]=r[n].value;return t},_=function(e,t,r){var n=t.meta.eventListeners;for(var i in n)!function(t){var r=function(e){for(var t=r.handlers,n=0;n<t.length;n++)t[n](e)};r.handlers=n[t],n[t]=r,e.addEventListener(t,r)}(i)},E=function(e,t){var r=null;if("#text"===e.type)r=document.createTextNode(e.val);else{if(r=e.meta.isSVG?document.createElementNS("http://www.w3.org/2000/svg",e.type):document.createElement(e.type),1===e.children.length&&"#text"===e.children[0].type)r.textContent=e.children[0].val,e.children[0].meta.el=r.firstChild;else for(var n=0;n<e.children.length;n++){var i=e.children[n];A(E(i,t),i,r)}_(r,e)}return D(r,{},e,e.props.attrs),e.meta.el=r,r},A=function(e,t,r){r.appendChild(e),t.meta.component&&T(e,t,t.meta.component)},w=function(e,t){e.__moon__&&e.__moon__.destroy(),t.removeChild(e)},R=function(e,t,r,n){e.__moon__&&e.__moon__.destroy(),n.replaceChild(t,e),r.meta.component&&T(t,r,r.meta.component)},C={SKIP:0,APPEND:1,REMOVE:2,REPLACE:3,TEXT:4,CHILDREN:5},L=function(e,t,r,n,i){return{type:e,val:t,props:r,children:i,meta:n||f()}},O=function(e,t,r){var n=r.opts.data||{};if(void 0!==r.opts.props)for(var i=r.opts.props,o=0;o<i.length;o++){var a=i[o];n[a]=e.attrs[a]}return r.opts.render(P,{data:n,slots:h(t)})},P=function(e,t,r,n){var o=null;if("#text"===e)return L("#text",r,{attrs:{}},t,[]);if(void 0!==(o=i[e])){if(!0===o.opts.functional)return O(t,n,i[e]);r.component=o}return L(e,"",t,r,n)},T=function(e,t,r){for(var n=new r.CTor,i=n.$props,o=n.$data,a=t.props.attrs,s=0;s<i.length;s++){var l=i[s];o[l]=a[l]}return n.$slots=h(t.children),n.$el=e,n.build(),$(n,"mounted"),t.meta.el=n.$el,n.$el},S=function(e,t,r){var n=t.meta.eventListeners,i=r.meta.eventListeners;for(var o in i){var a=n[o];void 0===a?e.removeEventListener(o,a):n[o].handlers=i[o]}},D=function(e,t,n){var i=n.props.attrs;for(var o in i){var a=i[o],s=t[o];void 0===a&&!1===a&&null===a||void 0!==s&&!1!==s&&null!==s&&a===s||(10===o.length&&"xlink:href"===o?e.setAttributeNS("http://www.w3.org/1999/xlink","href",a):e.setAttribute(o,!0===a?"":a))}for(var l in t){var u=i[l];void 0!==u&&!1!==u&&null!==u||e.removeAttribute(l)}var c=null;if(void 0!==(c=n.props.directives))for(var v in c){var f=null;void 0!==(f=r[v])&&f(e,c[v],n)}var p=null;if(void 0!==(p=n.props.dom))for(var d in p){var h=p[d];e[d]!==h&&(e[d]=h)}},G=function(e,t){if(void 0===e.__moon__)T(e,t,t.meta.component);else{for(var r=e.__moon__,n=!1,i=r.$props,o=r.$data,a=t.props.attrs,s=0;s<i.length;s++){var l=i[s];o[l]!==a[l]&&(o[l]=a[l],n=!0)}0!==t.children.length&&(r.$slots=h(t.children),n=!0),!0===n&&r.build()}},N=function(e,t,r,n){var i=e?e.nodeName.toLowerCase():null;if(null===e){var o=E(t,n);return A(o,t,r),o}if(null===t)return w(e,r),null;if(i!==t.type){var a=E(t,n);return R(e,a,t,r),a}if("#text"===t.type)return"#text"===i?(e.textContent!==t.val&&(e.textContent=t.val),t.meta.el=e):R(e,E(t,n),t,r),e;if(t.meta.el=e,void 0!==t.meta.component)return G(e,t),e;D(e,x(e),t),_(e,t);var s=t.props.dom;if(void 0!==s&&void 0!==s.innerHTML)return e;for(var l=t.children,u=l.length,c=0,v=e.firstChild,f=0!==u?l[0]:null;null!==f||null!==v;){var p=null!==v?v.nextSibling:null;N(v,f,e,n),f=++c<u?l[c]:null,v=p}return e},M=function(e,t,r,n){if(null===e)return A(E(t,n),t,r),C.APPEND;if(null===t)return w(e.meta.el,r),C.REMOVE;if(e===t)return C.SKIP;if(e.type!==t.type)return R(e.meta.el,E(t,n),t,r),C.REPLACE;if(!0===t.meta.shouldRender&&"#text"===t.type){var i=e.meta.el;return"#text"===e.type?(t.val!==e.val&&(i.textContent=t.val),C.TEXT):(R(i,E(t,n),t,r),C.REPLACE)}if(!0===t.meta.shouldRender){var o=e.meta.el;if(void 0!==t.meta.component)return G(o,t),C.SKIP;D(o,e.props.attrs,t),e.props.attrs=t.props.attrs,S(o,e,t);var a=t.props.dom;if(void 0!==a&&void 0!==a.innerHTML)return C.SKIP;var s=t.children,l=e.children,u=s.length,c=l.length;if(0===u){if(0!==c){for(var v=null;null!==(v=o.firstChild);)w(v,o);e.children=[]}}else for(var f=u>c?u:c,p=0,d=0;p<f;p++,d++){var h=d<c?l[d]:null,m=p<u?s[p]:null,g=M(h,m,o,n);switch(g){case C.APPEND:l[c++]=m;break;case C.REMOVE:l.splice(d--,1),c--;break;case C.REPLACE:l[d]=s[p];break;case C.TEXT:h.val=m.val}}return C.CHILDREN}return t.meta.el=e.meta.el,C.SKIP},j=/\s/,I=/"[^"]*"|'[^']*'|\.\w*[a-zA-Z$_]\w*|\w*[a-zA-Z$_]\w*:|(\w*[a-zA-Z$_]\w*)/g,K=["true","false","undefined","null","NaN","typeof","in"],V=function(e,t,r,n,i){var o={current:0,template:e,output:"",openDelimiterLen:t[0].length,closeDelimiterLen:t[1].length,openRE:new RegExp(r[0]),closeRE:new RegExp("\\s*"+r[1]),dependencies:n};return H(o,i),o.output},H=function(e,t){for(var r=e.template,n=r.length;e.current<n;){var i=z(e,e.openRE);if(i&&(e.output+=p(i)),e.current===n)break;e.current+=e.openDelimiterLen,Z(e);var o=z(e,e.closeRE);if(e.current===n)break;o&&(q(o,e.dependencies),t&&(o='" + '+o+' + "'),e.output+=o),Z(e),e.current+=e.closeDelimiterLen}},q=function(e,t){return e.replace(I,function(e,r){void 0!==r&&-1===K.indexOf(r)&&-1===t.indexOf(r)&&t.push(r)}),t},z=function(e,t){var r=e.template,n=r.substring(e.current),i=(n.length,n.search(t)),o="";switch(i){case-1:o=n;break;case 0:o="";break;default:o=n.substring(0,i)}return e.current+=o.length,o},Z=function(e){for(var t=e.template,r=t[e.current];j.test(r);)r=t[++e.current]},X=function(e){var t={input:e,current:0,tokens:[]};return F(t),t.tokens},F=function(e){for(var t=e.input,r=t.length;e.current<r;)"<"===t.charAt(e.current)?"\x3c!--"!==t.substr(e.current,4)?Q(e):J(e):B(e)},B=function(e){var t=e.current,r=e.input,n=r.length,i=r.substring(t).search(/<\/?(?:[A-Za-z]+\w*)|<!--/);if(-1===i)return e.tokens.push({type:"text",value:r.slice(t)}),void(e.current=n);0!==i&&(i+=t,e.tokens.push({type:"text",value:r.slice(t,i)}),e.current=i)},J=function(e){var t=e.current,r=e.input,n=r.length;t+=4;var i=r.indexOf("--\x3e",t);if(-1===i)return e.tokens.push({type:"comment",value:r.slice(t)}),void(e.current=n);e.tokens.push({type:"comment",value:r.slice(t,i)}),e.current=i+3},Q=function(e){var t=e.input,r=(t.length,"/"===t.charAt(e.current+1));e.current+=!0===r?2:1;var n=U(e);W(n,e);var i="/"===t.charAt(e.current);e.current+=!0===i?2:1,!0===r&&(n.closeStart=!0),!0===i&&(n.closeEnd=!0)},U=function(e){for(var t=e.input,r=t.length,n=e.current,i="";n<r;){var o=t.charAt(n);if("/"===o||">"===o||" "===o)break;i+=o,n++}var a={type:"tag",value:i};return e.tokens.push(a),e.current=n,a},W=function(e,t){for(var r=t.input,n=r.length,i=t.current,o=r.charAt(i),a=r.charAt(i+1),s=function(){i++,o=r.charAt(i),a=r.charAt(i+1)},l={};i<n&&">"!==o&&("/"!==o||">"!==a);)if(" "!==o){for(var u="",c=!1;i<n&&"="!==o;){if(" "===o||">"===o||"/"===o||">"===a){c=!0;break}u+=o,s()}var v={name:u,value:"",meta:{}};if(c)l[u]=v;else{s();var f=" ";for("'"!==o&&'"'!==o||(f=o,s());i<n&&o!==f;)v.value+=o,s();s();var p=u.indexOf(":");if(-1!==p){var d=u.split(":");v.name=d[0],v.meta.arg=d[1]}l[u]=v}}else s();t.current=i,e.attributes=l},Y=function(e){for(var t={type:"ROOT",children:[]},r={current:0,tokens:e};r.current<e.length;){var n=ne(r);n&&t.children.push(n)}return t},ee=["area","base","br","command","embed","hr","img","input","keygen","link","meta","param","source","track","wbr"],te=["svg","animate","circle","clippath","cursor","defs","desc","ellipse","filter","font-face","foreignObject","g","glyph","image","line","marker","mask","missing-glyph","path","pattern","polygon","polyline","rect","switch","symbol","text","textpath","tspan","use","view"],re=function(e,t,r){return{type:e,props:t,children:r}},ne=function(e){var t=e.tokens[e.current],r=e.tokens[e.current-1],n=e.tokens[e.current+1],i=function(i){e.current+=void 0===i?1:i,t=e.tokens[e.current],r=e.tokens[e.current-1],n=e.tokens[e.current+1]};if("text"===t.type)return i(),r.value;if("comment"===t.type)return i(),null;if("tag"===t.type){var o=t.value,a=t.closeStart,s=t.closeEnd,l=-1!==te.indexOf(o),u=-1!==ee.indexOf(o)||!0===s,c=re(o,t.attributes,[]);if(i(),l&&(c.isSVG=!0),!0===u)return c;if(!0===a)return null;if(void 0!==t){for(e.current;"tag"!==t.type||"tag"===t.type&&(void 0===t.closeStart&&void 0===t.closeEnd||t.value!==o);){var v=ne(e);if(null!==v&&c.children.push(v),i(0),void 0===t)break}i()}return c}i()},ie=null,oe=null,ae=function(e,t,r){var i=e.props.attrs,o="{attrs: {";e.props.directives=[];for(var a in i){var s=i[a],l=null,u=null;void 0!==(l=n[s.name])&&void 0!==(u=l.beforeGenerate)&&u(s.value,s.meta,e,t,r)}for(var c in i){var v=i[c],f=v.name,p=null;if(void 0!==(p=n[f])){var d=e.specialDirectivesAfter;void 0!==p.afterGenerate&&(void 0===d&&(e.specialDirectivesAfter=d={}),d[c]=v);var h=null;void 0!==(h=p.duringPropGenerate)&&(o+=h(v.value,v.meta,e,r)),e.meta.shouldRender=!0,delete i[c]}else if(f[0]+f[1]==="m-")e.props.directives.push(v),e.meta.shouldRender=!0;else{var m=v.value,g=V(m,ie,oe,r,!0);m!==g&&(e.meta.shouldRender=!0),o+='"'+c+'": "'+g+'", '}}0!==Object.keys(i).length?o=o.slice(0,-2)+"}":o+="}";var y=e.props.dom;if(void 0!==y){e.meta.shouldRender=!0,o+=", dom: {";for(var $ in y)o+='"'+$+'": '+y[$]+", ";o=o.slice(0,-2)+"}"}var b=e.props.directives;if(0!==b.length){o+=", directives: {";for(var k=0;k<b.length;k++){var x=b[k],_=x.value;0!==_.length?q(_,r):_='""',o+='"'+x.name+'": '+_+", "}o=o.slice(0,-2)+"}"}return o+="}"},se=function(e){if(0===Object.keys(e).length)return"{}";var t="{";for(var r in e)t+='"'+r+'": ['+ue(e[r])+"], ";return t=t.slice(0,-2)+"}"},le=function(e){var t="{";for(var r in e)t+="eventListeners"===r?'"'+r+'": '+se(e[r])+", ":'"'+r+'": '+e[r]+", ";return t=t.slice(0,-2)+"}"},ue=function(e){for(var t="",r=0;r<e.length;r++)t+=e[r]+", ";return t=t.slice(0,-2)},ce=function(e,t,r){var n='h("'+e.type+'", ';n+=ae(e,t,r)+", ";for(var i=[],o=e.children,a=0;a<o.length;a++)i.push(ve(o[a],e,r));return!0===e.meta.shouldRender&&void 0!==t&&(t.meta.shouldRender=!0),n+=le(e.meta),0!==i.length?!0===e.deep?n+=", [].concat.apply([], ["+ue(i)+"])":n+=", ["+ue(i)+"]":n+=", []",n+=")"},ve=function(e,t,r){var i="";if("string"==typeof e){var o=e,a=V(o,ie,oe,r,!0),s=f();o!==a&&(t.meta.shouldRender=!0,s.shouldRender=!0),i+='h("#text", '+le(s)+', "'+a+'")'}else{e.meta=f(),!0===e.isSVG&&(e.meta.isSVG=!0),e.props={attrs:e.props};var l="";if("slot"===e.type){t.meta.shouldRender=!0,t.deep=!0;var u=e.props.attrs.name;l="instance.$slots['"+(u&&u.value||"default")+"']"}else l=ce(e,t,r);if(void 0!==e.specialDirectivesAfter)for(var c in e.specialDirectivesAfter){var v=e.specialDirectivesAfter[c];l=n[v.name].afterGenerate(v.value,v.meta,l,e,r)}i+=l}return i},fe=function(e){var r=e.children[0],n=[],i=null;(i=t.config.delimiters)!==ie&&(ie=i,oe=new Array(2),oe[0]=b(ie[0]),oe[1]=b(ie[1]));for(var o=ve(r,void 0,n),a="",s=0;s<n.length;s++){var l=n[s];a+="var "+l+' = instance.get("'+l+'");'}var u="var instance = this; "+a+" return "+o;try{return new Function("h",u)}catch(e){return c("Could not create render function"),k}},pe=function(e){var t=X(e),r=Y(t);return fe(r)};t.prototype.get=function(e){var t=this.$observer,r=null;return null!==(r=t.target)&&(void 0===t.map[e]?t.map[e]=[r]:-1===t.map[e].indexOf(r)&&t.map[e].push(r)),this.$data[e]},t.prototype.set=function(e,t){var r=this.$observer,n=d(0,this.$data,e,t),i=null;void 0!==(i=r.setters[n])&&i.call(this,t),r.notify(n,t),v(this)},t.prototype.destroy=function(){this.off(),this.$el=null,this.$destroyed=!0,$(this,"destroyed")},t.prototype.callMethod=function(e,t){t=t||[],this.$data[e].apply(this,t)},t.prototype.on=function(e,t){var r=this.$events[e];void 0===r?this.$events[e]=[t]:r.push(t)},t.prototype.off=function(e,t){if(void 0===e)this.$events={};else if(void 0===t)this.$events[e]=[];else{var r=this.$events[e],n=r.indexOf(t);r.splice(n,1)}},t.prototype.emit=function(e,t){var r=t||{};r.type=e;var n=this.$events[e],i=this.$events["*"];if(void 0!==n)for(var o=0;o<n.length;o++)n[o](r);if(void 0!==i)for(var o=0;o<i.length;o++)i[o](r)},t.prototype.renderLoop=function(e,t){for(var r=new Array(e.length),n=0;n<e.length;n++)r[n]=t(e[n],n);return r},t.prototype.renderClass=function(e){if("string"==typeof e)return e;var t="";if(Array.isArray(e))for(var r=0;r<e.length;r++)t+=this.renderClass(e[r])+" ";else if("object"==typeof e)for(var n in e)e[n]&&(t+=n+" ");return t=t.slice(0,-1)},t.prototype.mount=function(e){this.$el="string"==typeof e?document.querySelector(e):e,this.$destroyed=!1,this.$el.__moon__=this,y(this,"$template",this.$options.template,this.$el.outerHTML),this.$render===k&&(this.$render=t.compile(this.$template)),this.build(),$(this,"mounted")},t.prototype.render=function(){return this.$render(P)},t.prototype.patch=function(e,t,r){if(void 0!==e.meta&&void 0!==e.meta.el)t.type!==e.type?(R(e.meta.el,E(t,this),r),this.$el=t.meta.el,this.$el.__moon__=this):M(e,t,r,this);else if(e instanceof Node){var n=N(e,t,r,this);n!==e&&(this.$el=t.meta.el,this.$el.__moon__=this)}},t.prototype.build=function(){var e=this.render(),t=null;void 0!==this.$dom.meta?t=this.$dom:(t=this.$el,this.$dom=e),this.patch(t,e,this.$el.parentNode)},t.prototype.init=function(){u("======= Moon ======="),$(this,"init");var e=this.$options.el;void 0!==e&&this.mount(e)},t.config={silent:!0,delimiters:["{{","}}"],keyCodes:function(e){for(var t in e)o[t]="if(event.keyCode !== "+e[t]+") {return;};"}},t.version="0.10.0",t.util={noop:k,error:c,log:u,merge:g,extend:m,h:P},t.use=function(e,r){e.init(t,r)},t.compile=function(e){return pe(e)},t.nextTick=function(e){setTimeout(e,0)},t.directive=function(e,t){r["m-"+e]=t},t.component=function(e,r){function n(){t.call(this,r)}var o=this;return void 0!==r.name?e=r.name:r.name=e,void 0!==r.data&&"function"!=typeof r.data&&c("In components, data must be a function returning an object"),n.prototype=Object.create(o.prototype),n.prototype.constructor=n,n.prototype.init=function(){$(this,"init");var e=this.$options;this.$destroyed=!1,y(this,"$props",e.props,[]);var r=e.template;this.$template=r,this.$render===k&&(this.$render=t.compile(r))},i[e]={CTor:n,opts:r},n};var de='h("#text", '+le(f())+', "")';return n["m-if"]={afterGenerate:function(e,t,r,n,i){return q(e,i),e+" ? "+r+" : "+de}},n["m-for"]={beforeGenerate:function(e,t,r,n,i){n.deep=!0},afterGenerate:function(e,t,r,n,i){var o=e.split(" in "),a=o[0].split(","),s=o[1];q(s,i);for(var l=a.join(","),u=0;u<a.length;u++){var c=i.indexOf(a[u]);-1!==c&&i.splice(c,1)}return"instance.renderLoop("+s+", function("+l+") { return "+r+"; })"}},n["m-on"]={beforeGenerate:function(e,t,r,n,i){var a=e,s=t.arg.split("."),l=s.shift(),u="event",c=a.split("(");c.length>1&&(a=c.shift(),u=c.join("(").slice(0,-1),q(u,i));for(var v="",f=0;f<s.length;f++)v+=o[s[f]];var p="function(event) {"+v+'instance.callMethod("'+a+'", ['+u+"])}",d=r.meta.eventListeners,h=d[l];void 0===h?d[l]=[p]:h.push(p)}},n["m-model"]={beforeGenerate:function(e,t,r,n,i){var o=r.props.attrs;q(e,i);var a="input",s="value",l=e,u=e,c="event.target."+s,v=o.type;if(void 0!==v){v=v.value;var f=!1;if("checkbox"===v||"radio"===v&&(f=!0))if(a="change",s="checked",!0===f){var p=o.value,d=void 0===p?"null":'"'+p.value+'"';l=l+" === "+d,c=d}else c="event.target."+s}var h=u.indexOf("["),m=u.indexOf("."),g=null,y=null,$=-1;-1===h&&-1===m||($=-1===h?m:-1===m?h:h<m?h:m,g=e.substring(0,$),y=e.substring($),u=g+y.replace(I,function(e,t){return void 0!==t?'" + '+t+' + "':e}));var b='function(event) {instance.set("'+u+'", '+c+")}",k=r.meta.eventListeners,x=k[a];void 0===x?k[a]=[b]:x.push(b);var _=r.props.dom;void 0===_&&(r.props.dom=_={}),_[s]=l}},n["m-literal"]={duringPropGenerate:function(e,t,r,n){var i=t.arg;return q(e,n),"class"===i?'"class": instance.renderClass('+e+"), ":'"'+i+'": '+e+", "}},n["m-html"]={beforeGenerate:function(e,t,r,n,i){var o=r.props.dom;void 0===o&&(r.props.dom=o={}),q(e,i),o.innerHTML='("" + '+e+")"}},n["m-mask"]={},r["m-show"]=function(e,t,r){e.style.display=t?"":"none"},t});
\ No newline at end of file
+!function(e,t){"object"==typeof module&&module.exports?module.exports=t():e.Moon=t()}(this,function(){"use strict";function e(e){this.instance=e,this.cache={},this.setters={},this.clear={},this.target=null,this.map={}}function t(t){void 0===t&&(t={}),this.$options=t;var r=this;this.$id=a++,y(this,"$name",t.name,"root");var n=t.data;this.$data=void 0===n?{}:"function"==typeof n?n():n,y(this,"$render",t.render,k),y(this,"$hooks",t.hooks,{});var i=t.methods;void 0!==i&&s(r,i),this.$events={},this.$dom={},this.$observer=new e(this),this.$destroyed=!0,this.$queued=!1;var o=t.computed;void 0!==o&&l(this,o),this.init()}var r={},n={},i={},o={stop:"event.stopPropagation();",prevent:"event.preventDefault();",ctrl:"if(!event.ctrlKey) {return;};",shift:"if(!event.shiftKey) {return;};",alt:"if(!event.altKey) {return;};",enter:"if(event.keyCode !== 13) {return;};"},a=0,s=function(e,t){for(var r in t)!function(t,r){e.$data[t]=function(){return r.apply(e,arguments)}}(r,t[r])},l=function(e,t){for(var r in t)!function(r){var n=e.$observer;n.observe(r),Object.defineProperty(e.$data,r,{get:function(){var i=null;return void 0===n.cache[r]?(n.target=r,i=t[r].get.call(e),n.target=null,n.cache[r]=i):i=n.cache[r],i},set:k});var i=null;void 0!==(i=t[r].set)&&(n.setters[r]=i)}(r)};e.prototype.observe=function(e){var t=this;this.clear[e]=function(){t.cache[e]=void 0}},e.prototype.notify=function(e,t){var r=null;if(void 0!==(r=this.map[e]))for(var n=0;n<r.length;n++)this.notify(r[n]);var i=null;void 0!==(i=this.clear[e])&&i()};var u=function(e){!1===t.config.silent&&console.log(e)},c=function(e){!1===t.config.silent&&console.error("[Moon] ERR: "+e)},v=function(e){!1===e.$queued&&!1===e.$destroyed&&(e.$queued=!0,setTimeout(function(){e.build(),$(e,"updated"),e.$queued=!1},0))},f=function(){return{shouldRender:!1,eventListeners:{}}},p=function(e){return e.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\n/g,"\\n")},d=function(e,t,r,n){r=r.replace(/\[(\w+)\]/g,".$1");for(var i=r.split("."),o=0;o<i.length-1;o++){t=t[i[o]]}return t[i[o]]=n,i[0]},h=function(e){var t={};if(t.default=[],0===e.length)return t;for(var r=0;r<e.length;r++){var n=e[r],i=n.props.attrs,o="";void 0!==(o=i.slot)?(void 0===t[o]?t[o]=[n]:t[o].push(n),delete i.slot):t.default.push(n)}return t},m=function(e,t){for(var r in t)e[r]=t[r];return e},g=function(e,t){var r={};for(var n in e)r[n]=e[n];for(var n in t)r[n]=t[n];return r},y=function(e,t,r,n){e[t]=void 0===r?n:r},$=function(e,t){var r=e.$hooks[t];void 0!==r&&r.call(e)},b=function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},k=function(){},x=function(e){for(var t={},r=e.attributes,n=r.length;n--;)t[r[n].name]=r[n].value;return t},_=function(e,t,r){var n=t.meta.eventListeners;for(var i in n)!function(t){var r=function(e){for(var t=r.handlers,n=0;n<t.length;n++)t[n](e)};r.handlers=n[t],n[t]=r,e.addEventListener(t,r)}(i)},E=function(e,t){var r=null;if("#text"===e.type)r=document.createTextNode(e.val);else{if(r=e.meta.isSVG?document.createElementNS("http://www.w3.org/2000/svg",e.type):document.createElement(e.type),1===e.children.length&&"#text"===e.children[0].type)r.textContent=e.children[0].val,e.children[0].meta.el=r.firstChild;else for(var n=0;n<e.children.length;n++){var i=e.children[n];A(E(i,t),i,r)}_(r,e)}return D(r,{},e,e.props.attrs),e.meta.el=r,r},A=function(e,t,r){r.appendChild(e),t.meta.component&&T(e,t,t.meta.component)},w=function(e,t){e.__moon__&&e.__moon__.destroy(),t.removeChild(e)},R=function(e,t,r,n){e.__moon__&&e.__moon__.destroy(),n.replaceChild(t,e),r.meta.component&&T(t,r,r.meta.component)},C={SKIP:0,APPEND:1,REMOVE:2,REPLACE:3,TEXT:4,CHILDREN:5},L=function(e,t,r,n,i){return{type:e,val:t,props:r,children:i,meta:n||f()}},O=function(e,t,r){var n=r.opts.data||{};if(void 0!==r.opts.props)for(var i=r.opts.props,o=0;o<i.length;o++){var a=i[o];n[a]=e.attrs[a]}return r.opts.render(P,{data:n,slots:h(t)})},P=function(e,t,r,n){var o=null;if("#text"===e)return L("#text",r,{attrs:{}},t,[]);if(void 0!==(o=i[e])){if(!0===o.opts.functional)return O(t,n,i[e]);r.component=o}return L(e,"",t,r,n)},T=function(e,t,r){for(var n=new r.CTor,i=n.$props,o=n.$data,a=t.props.attrs,s=0;s<i.length;s++){var l=i[s];o[l]=a[l]}return n.$slots=h(t.children),n.$el=e,n.build(),$(n,"mounted"),t.meta.el=n.$el,n.$el},S=function(e,t,r){var n=t.meta.eventListeners,i=r.meta.eventListeners;for(var o in i){var a=n[o];void 0===a?e.removeEventListener(o,a):n[o].handlers=i[o]}},D=function(e,t,n){var i=n.props.attrs;for(var o in i){var a=i[o],s=t[o];void 0===a&&!1===a&&null===a||void 0!==s&&!1!==s&&null!==s&&a===s||(10===o.length&&"xlink:href"===o?e.setAttributeNS("http://www.w3.org/1999/xlink","href",a):e.setAttribute(o,!0===a?"":a))}for(var l in t){var u=i[l];void 0!==u&&!1!==u&&null!==u||e.removeAttribute(l)}var c=null;if(void 0!==(c=n.props.directives))for(var v in c){var f=null;void 0!==(f=r[v])&&f(e,c[v],n)}var p=null;if(void 0!==(p=n.props.dom))for(var d in p){var h=p[d];e[d]!==h&&(e[d]=h)}},G=function(e,t){if(void 0===e.__moon__)T(e,t,t.meta.component);else{for(var r=e.__moon__,n=!1,i=r.$props,o=r.$data,a=t.props.attrs,s=0;s<i.length;s++){var l=i[s];o[l]!==a[l]&&(o[l]=a[l],n=!0)}0!==t.children.length&&(r.$slots=h(t.children),n=!0),!0===n&&r.build()}},N=function(e,t,r,n){var i=e?e.nodeName.toLowerCase():null;if(null===e){var o=E(t,n);return A(o,t,r),o}if(null===t)return w(e,r),null;if(i!==t.type){var a=E(t,n);return R(e,a,t,r),a}if("#text"===t.type)return"#text"===i?(e.textContent!==t.val&&(e.textContent=t.val),t.meta.el=e):R(e,E(t,n),t,r),e;if(t.meta.el=e,void 0!==t.meta.component)return G(e,t),e;D(e,x(e),t),_(e,t);var s=t.props.dom;if(void 0!==s&&void 0!==s.innerHTML)return e;for(var l=t.children,u=l.length,c=0,v=e.firstChild,f=0!==u?l[0]:null;null!==f||null!==v;){var p=null!==v?v.nextSibling:null;N(v,f,e,n),f=++c<u?l[c]:null,v=p}return e},M=function(e,t,r,n){if(null===e)return A(E(t,n),t,r),C.APPEND;if(null===t)return w(e.meta.el,r),C.REMOVE;if(e===t)return C.SKIP;if(e.type!==t.type)return R(e.meta.el,E(t,n),t,r),C.REPLACE;if(!0===t.meta.shouldRender&&"#text"===t.type){var i=e.meta.el;return"#text"===e.type?(t.val!==e.val&&(i.textContent=t.val),C.TEXT):(R(i,E(t,n),t,r),C.REPLACE)}if(!0===t.meta.shouldRender){var o=e.meta.el;if(void 0!==t.meta.component)return G(o,t),C.SKIP;D(o,e.props.attrs,t),e.props.attrs=t.props.attrs,S(o,e,t);var a=t.props.dom;if(void 0!==a&&void 0!==a.innerHTML)return C.SKIP;var s=t.children,l=e.children,u=s.length,c=l.length;if(0===u){if(0!==c){for(var v=null;null!==(v=o.firstChild);)w(v,o);e.children=[]}}else for(var f=u>c?u:c,p=0,d=0;p<f;p++,d++){var h=d<c?l[d]:null,m=p<u?s[p]:null,g=M(h,m,o,n);switch(g){case C.APPEND:l[c++]=m;break;case C.REMOVE:l.splice(d--,1),c--;break;case C.REPLACE:l[d]=s[p];break;case C.TEXT:h.val=m.val}}return C.CHILDREN}return t.meta.el=e.meta.el,C.SKIP},j=/\s/,I=/"[^"]*"|'[^']*'|\.\w*[a-zA-Z$_]\w*|\w*[a-zA-Z$_]\w*:|(\w*[a-zA-Z$_]\w*)/g,K=["true","false","undefined","null","NaN","typeof","in"],V=function(e,t,r,n,i){var o={current:0,template:e,output:"",openDelimiterLen:t[0].length,closeDelimiterLen:t[1].length,openRE:new RegExp(r[0]),closeRE:new RegExp("\\s*"+r[1]),dependencies:n};return H(o,i),o.output},H=function(e,t){for(var r=e.template,n=r.length;e.current<n;){var i=z(e,e.openRE);if(i&&(e.output+=p(i)),e.current===n)break;e.current+=e.openDelimiterLen,Z(e);var o=z(e,e.closeRE);if(e.current===n)break;o&&(q(o,e.dependencies),t&&(o='" + '+o+' + "'),e.output+=o),Z(e),e.current+=e.closeDelimiterLen}},q=function(e,t){return e.replace(I,function(e,r){void 0!==r&&-1===K.indexOf(r)&&-1===t.indexOf(r)&&t.push(r)}),t},z=function(e,t){var r=e.template,n=r.substring(e.current),i=(n.length,n.search(t)),o="";switch(i){case-1:o=n;break;case 0:o="";break;default:o=n.substring(0,i)}return e.current+=o.length,o},Z=function(e){for(var t=e.template,r=t[e.current];j.test(r);)r=t[++e.current]},X=function(e){var t={input:e,current:0,tokens:[]};return F(t),t.tokens},F=function(e){for(var t=e.input,r=t.length;e.current<r;)"<"===t.charAt(e.current)?"\x3c!--"!==t.substr(e.current,4)?Q(e):J(e):B(e)},B=function(e){var t=e.current,r=e.input,n=r.length,i=r.substring(t).search(/<\/?(?:[A-Za-z]+\w*)|<!--/);if(-1===i)return e.tokens.push({type:"text",value:r.slice(t)}),void(e.current=n);0!==i&&(i+=t,e.tokens.push({type:"text",value:r.slice(t,i)}),e.current=i)},J=function(e){var t=e.current,r=e.input,n=r.length;t+=4;var i=r.indexOf("--\x3e",t);-1===i?(e.tokens.push({type:"comment",value:r.slice(t)}),e.current=n):(e.tokens.push({type:"comment",value:r.slice(t,i)}),e.current=i+3)},Q=function(e){var t=e.input,r=(t.length,"/"===t.charAt(e.current+1));e.current+=!0===r?2:1;var n=U(e);W(n,e);var i="/"===t.charAt(e.current);e.current+=!0===i?2:1,!0===r&&(n.closeStart=!0),!0===i&&(n.closeEnd=!0)},U=function(e){for(var t=e.input,r=t.length,n=e.current,i="";n<r;){var o=t.charAt(n);if("/"===o||">"===o||" "===o)break;i+=o,n++}var a={type:"tag",value:i};return e.tokens.push(a),e.current=n,a},W=function(e,t){for(var r=t.input,n=r.length,i=t.current,o=r.charAt(i),a=r.charAt(i+1),s=function(){i++,o=r.charAt(i),a=r.charAt(i+1)},l={};i<n&&">"!==o&&("/"!==o||">"!==a);)if(" "!==o){for(var u="",c=!1;i<n&&"="!==o;){if(" "===o||">"===o||"/"===o&&">"===a){c=!0;break}u+=o,s()}var v={name:u,value:"",meta:{}};if(!0!==c){s();var f=" ";for("'"!==o&&'"'!==o||(f=o,s());i<n&&o!==f;)v.value+=o,s();s();var p=u.indexOf(":");if(-1!==p){var d=u.split(":");v.name=d[0],v.meta.arg=d[1]}l[u]=v}else l[u]=v}else s();t.current=i,e.attributes=l},Y=function(e){for(var t={type:"ROOT",children:[]},r={current:0,tokens:e};r.current<e.length;){var n=ne(r);n&&t.children.push(n)}return t},ee=["area","base","br","command","embed","hr","img","input","keygen","link","meta","param","source","track","wbr"],te=["svg","animate","circle","clippath","cursor","defs","desc","ellipse","filter","font-face","foreignObject","g","glyph","image","line","marker","mask","missing-glyph","path","pattern","polygon","polyline","rect","switch","symbol","text","textpath","tspan","use","view"],re=function(e,t,r){return{type:e,props:t,children:r}},ne=function(e){var t=e.tokens[e.current],r=e.tokens[e.current-1],n=e.tokens[e.current+1],i=function(i){e.current+=void 0===i?1:i,t=e.tokens[e.current],r=e.tokens[e.current-1],n=e.tokens[e.current+1]};if("text"===t.type)return i(),r.value;if("comment"===t.type)return i(),null;if("tag"===t.type){var o=t.value,a=t.closeStart,s=t.closeEnd,l=-1!==te.indexOf(o),u=-1!==ee.indexOf(o)||!0===s,c=re(o,t.attributes,[]);if(i(),l&&(c.isSVG=!0),!0===u)return c;if(!0===a)return null;if(void 0!==t){for(e.current;"tag"!==t.type||"tag"===t.type&&(void 0===t.closeStart&&void 0===t.closeEnd||t.value!==o);){var v=ne(e);if(null!==v&&c.children.push(v),i(0),void 0===t)break}i()}return c}i()},ie=null,oe=null,ae=function(e,t,r){var i=e.props.attrs,o="{attrs: {";e.props.directives=[];for(var a in i){var s=i[a],l=null,u=null;void 0!==(l=n[s.name])&&void 0!==(u=l.beforeGenerate)&&u(s.value,s.meta,e,t,r)}for(var c in i){var v=i[c],f=v.name,p=null;if(void 0!==(p=n[f])){var d=e.specialDirectivesAfter;void 0!==p.afterGenerate&&(void 0===d&&(e.specialDirectivesAfter=d={}),d[c]=v);var h=null;void 0!==(h=p.duringPropGenerate)&&(o+=h(v.value,v.meta,e,r)),e.meta.shouldRender=!0,delete i[c]}else if(f[0]+f[1]==="m-")e.props.directives.push(v),e.meta.shouldRender=!0;else{var m=v.value,g=V(m,ie,oe,r,!0);m!==g&&(e.meta.shouldRender=!0),o+='"'+c+'": "'+g+'", '}}0!==Object.keys(i).length?o=o.slice(0,-2)+"}":o+="}";var y=e.props.dom;if(void 0!==y){e.meta.shouldRender=!0,o+=", dom: {";for(var $ in y)o+='"'+$+'": '+y[$]+", ";o=o.slice(0,-2)+"}"}var b=e.props.directives;if(0!==b.length){o+=", directives: {";for(var k=0;k<b.length;k++){var x=b[k],_=x.value;0!==_.length?q(_,r):_='""',o+='"'+x.name+'": '+_+", "}o=o.slice(0,-2)+"}"}return o+="}"},se=function(e){if(0===Object.keys(e).length)return"{}";var t="{";for(var r in e)t+='"'+r+'": ['+ue(e[r])+"], ";return t=t.slice(0,-2)+"}"},le=function(e){var t="{";for(var r in e)t+="eventListeners"===r?'"'+r+'": '+se(e[r])+", ":'"'+r+'": '+e[r]+", ";return t=t.slice(0,-2)+"}"},ue=function(e){for(var t="",r=0;r<e.length;r++)t+=e[r]+", ";return t=t.slice(0,-2)},ce=function(e,t,r){var n='h("'+e.type+'", ';n+=ae(e,t,r)+", ";for(var i=[],o=e.children,a=0;a<o.length;a++)i.push(ve(o[a],e,r));return!0===e.meta.shouldRender&&void 0!==t&&(t.meta.shouldRender=!0),n+=le(e.meta),0!==i.length?!0===e.deep?n+=", [].concat.apply([], ["+ue(i)+"])":n+=", ["+ue(i)+"]":n+=", []",n+=")"},ve=function(e,t,r){var i="";if("string"==typeof e){var o=e,a=V(o,ie,oe,r,!0),s=f();o!==a&&(t.meta.shouldRender=!0,s.shouldRender=!0),i+='h("#text", '+le(s)+', "'+a+'")'}else{e.meta=f(),!0===e.isSVG&&(e.meta.isSVG=!0),e.props={attrs:e.props};var l="";if("slot"===e.type){t.meta.shouldRender=!0,t.deep=!0;var u=e.props.attrs.name;l="instance.$slots['"+(u&&u.value||"default")+"']"}else l=ce(e,t,r);if(void 0!==e.specialDirectivesAfter)for(var c in e.specialDirectivesAfter){var v=e.specialDirectivesAfter[c];l=n[v.name].afterGenerate(v.value,v.meta,l,e,r)}i+=l}return i},fe=function(e){var r=e.children[0],n=[],i=null;(i=t.config.delimiters)!==ie&&(ie=i,oe=new Array(2),oe[0]=b(ie[0]),oe[1]=b(ie[1]));for(var o=ve(r,void 0,n),a="",s=0;s<n.length;s++){var l=n[s];a+="var "+l+' = instance.get("'+l+'");'}var u="var instance = this; "+a+" return "+o;try{return new Function("h",u)}catch(e){return c("Could not create render function"),k}},pe=function(e){var t=X(e),r=Y(t);return fe(r)};t.prototype.get=function(e){var t=this.$observer,r=null;return null!==(r=t.target)&&(void 0===t.map[e]?t.map[e]=[r]:-1===t.map[e].indexOf(r)&&t.map[e].push(r)),this.$data[e]},t.prototype.set=function(e,t){var r=this.$observer,n=d(0,this.$data,e,t),i=null;void 0!==(i=r.setters[n])&&i.call(this,t),r.notify(n,t),v(this)},t.prototype.destroy=function(){this.off(),this.$el=null,this.$destroyed=!0,$(this,"destroyed")},t.prototype.callMethod=function(e,t){t=t||[],this.$data[e].apply(this,t)},t.prototype.on=function(e,t){var r=this.$events[e];void 0===r?this.$events[e]=[t]:r.push(t)},t.prototype.off=function(e,t){if(void 0===e)this.$events={};else if(void 0===t)this.$events[e]=[];else{var r=this.$events[e],n=r.indexOf(t);r.splice(n,1)}},t.prototype.emit=function(e,t){var r=t||{};r.type=e;var n=this.$events[e],i=this.$events["*"];if(void 0!==n)for(var o=0;o<n.length;o++)n[o](r);if(void 0!==i)for(var o=0;o<i.length;o++)i[o](r)},t.prototype.renderLoop=function(e,t){for(var r=new Array(e.length),n=0;n<e.length;n++)r[n]=t(e[n],n);return r},t.prototype.renderClass=function(e){if("string"==typeof e)return e;var t="";if(Array.isArray(e))for(var r=0;r<e.length;r++)t+=this.renderClass(e[r])+" ";else if("object"==typeof e)for(var n in e)e[n]&&(t+=n+" ");return t=t.slice(0,-1)},t.prototype.mount=function(e){this.$el="string"==typeof e?document.querySelector(e):e,this.$destroyed=!1,this.$el.__moon__=this,y(this,"$template",this.$options.template,this.$el.outerHTML),this.$render===k&&(this.$render=t.compile(this.$template)),this.build(),$(this,"mounted")},t.prototype.render=function(){return this.$render(P)},t.prototype.patch=function(e,t,r){if(void 0!==e.meta&&void 0!==e.meta.el)t.type!==e.type?(R(e.meta.el,E(t,this),r),this.$el=t.meta.el,this.$el.__moon__=this):M(e,t,r,this);else if(e instanceof Node){var n=N(e,t,r,this);n!==e&&(this.$el=t.meta.el,this.$el.__moon__=this)}},t.prototype.build=function(){var e=this.render(),t=null;void 0!==this.$dom.meta?t=this.$dom:(t=this.$el,this.$dom=e),this.patch(t,e,this.$el.parentNode)},t.prototype.init=function(){u("======= Moon ======="),$(this,"init");var e=this.$options.el;void 0!==e&&this.mount(e)},t.config={silent:!0,delimiters:["{{","}}"],keyCodes:function(e){for(var t in e)o[t]="if(event.keyCode !== "+e[t]+") {return;};"}},t.version="0.10.0",t.util={noop:k,error:c,log:u,merge:g,extend:m,h:P},t.use=function(e,r){e.init(t,r)},t.compile=function(e){return pe(e)},t.nextTick=function(e){setTimeout(e,0)},t.directive=function(e,t){r["m-"+e]=t},t.component=function(e,r){function n(){t.call(this,r)}var o=this;return void 0!==r.name?e=r.name:r.name=e,void 0!==r.data&&"function"!=typeof r.data&&c("In components, data must be a function returning an object"),n.prototype=Object.create(o.prototype),n.prototype.constructor=n,n.prototype.init=function(){$(this,"init");var e=this.$options;this.$destroyed=!1,y(this,"$props",e.props,[]);var r=e.template;this.$template=r,this.$render===k&&(this.$render=t.compile(r))},i[e]={CTor:n,opts:r},n};var de='h("#text", '+le(f())+', "")';return n["m-if"]={afterGenerate:function(e,t,r,n,i){return q(e,i),e+" ? "+r+" : "+de}},n["m-for"]={beforeGenerate:function(e,t,r,n,i){n.deep=!0},afterGenerate:function(e,t,r,n,i){var o=e.split(" in "),a=o[0].split(","),s=o[1];q(s,i);for(var l=a.join(","),u=0;u<a.length;u++){var c=i.indexOf(a[u]);-1!==c&&i.splice(c,1)}return"instance.renderLoop("+s+", function("+l+") { return "+r+"; })"}},n["m-on"]={beforeGenerate:function(e,t,r,n,i){var a=e,s=t.arg.split("."),l=s.shift(),u="event",c=a.split("(");c.length>1&&(a=c.shift(),u=c.join("(").slice(0,-1),q(u,i));for(var v="",f=0;f<s.length;f++)v+=o[s[f]];var p="function(event) {"+v+'instance.callMethod("'+a+'", ['+u+"])}",d=r.meta.eventListeners,h=d[l];void 0===h?d[l]=[p]:h.push(p)}},n["m-model"]={beforeGenerate:function(e,t,r,n,i){var o=r.props.attrs;q(e,i);var a="input",s="value",l=e,u=e,c="event.target."+s,v=o.type;if(void 0!==v){v=v.value;var f=!1;if("checkbox"===v||"radio"===v&&(f=!0))if(a="change",s="checked",!0===f){var p=o.value,d=void 0===p?"null":'"'+p.value+'"';l=l+" === "+d,c=d}else c="event.target."+s}var h=u.indexOf("["),m=u.indexOf("."),g=null,y=null,$=-1;-1===h&&-1===m||($=-1===h?m:-1===m?h:h<m?h:m,g=e.substring(0,$),y=e.substring($),u=g+y.replace(I,function(e,t){return void 0!==t?'" + '+t+' + "':e}));var b='function(event) {instance.set("'+u+'", '+c+")}",k=r.meta.eventListeners,x=k[a];void 0===x?k[a]=[b]:x.push(b);var _=r.props.dom;void 0===_&&(r.props.dom=_={}),_[s]=l}},n["m-literal"]={duringPropGenerate:function(e,t,r,n){var i=t.arg;return q(e,n),"class"===i?'"class": instance.renderClass('+e+"), ":'"'+i+'": '+e+", "}},n["m-html"]={beforeGenerate:function(e,t,r,n,i){var o=r.props.dom;void 0===o&&(r.props.dom=o={}),q(e,i),o.innerHTML='("" + '+e+")"}},n["m-mask"]={},r["m-show"]=function(e,t,r){e.style.display=t?"":"none"},t});
\ No newline at end of file
diff --git a/src/compiler/lexer.js b/src/compiler/lexer.js
index 02476e18..ac0537b9 100644
--- a/src/compiler/lexer.js
+++ b/src/compiler/lexer.js
@@ -38,28 +38,23 @@ const lexText = function(state) {
 
   let endOfText = input.substring(current).search(tagOrCommentStartRE);
 
-  // Only Text
   if(endOfText === -1) {
+    // Only Text
     state.tokens.push({
       type: "text",
       value: input.slice(current)
     });
     state.current = len;
     return;
+  } else if(endOfText !== 0) {
+    // End of Text Found
+    endOfText += current;
+    state.tokens.push({
+      type: "text",
+      value: input.slice(current, endOfText)
+    });
+    state.current = endOfText;
   }
-
-  // No Text at All
-  if(endOfText === 0) {
-    return;
-  }
-
-  // End of Text Found
-  endOfText += current;
-  state.tokens.push({
-    type: "text",
-    value: input.slice(current, endOfText)
-  });
-  state.current = endOfText;
 }
 
 const lexComment = function(state) {
@@ -71,22 +66,21 @@ const lexComment = function(state) {
 
   const endOfComment = input.indexOf("-->", current);
 
-  // Only an unclosed comment
   if(endOfComment === -1) {
+    // Only an unclosed comment
     state.tokens.push({
       type: "comment",
       value: input.slice(current)
     });
     state.current = len;
-    return;
+  } else {
+    // End of Comment Found
+    state.tokens.push({
+      type: "comment",
+      value: input.slice(current, endOfComment)
+    });
+    state.current = endOfComment + 3;
   }
-
-  // End of Comment Found
-  state.tokens.push({
-    type: "comment",
-    value: input.slice(current, endOfComment)
-  });
-  state.current = endOfComment + 3;
 }
 
 const lexTag = function(state) {
@@ -163,7 +157,7 @@ const lexAttributes = function(tagToken, state) {
       break;
     }
 
-    // If there is a space, the attribute ended
+    // If there is a space, skip
     if(char === " ") {
       incrementChar();
       continue;
@@ -174,11 +168,11 @@ const lexAttributes = function(tagToken, state) {
     let noValue = false;
 
     while(current < len && char !== "=") {
-      if((char !== " ") && (char !== ">") && (char !== "/" && nextChar !== ">")) {
-        attrName += char;
-      } else {
+      if((char === " ") || (char === ">") || (char === "/" && nextChar === ">")) {
         noValue = true;
         break;
+      } else {
+        attrName += char;
       }
       incrementChar();
     }
@@ -189,7 +183,7 @@ const lexAttributes = function(tagToken, state) {
       meta: {}
     }
 
-    if(noValue) {
+    if(noValue === true) {
       attributes[attrName] = attrValue;
       continue;
     }