diff --git a/dist/dust-core-2.0.2.js b/dist/dust-core-2.0.2.js
new file mode 100644
index 00000000..23912be6
--- /dev/null
+++ b/dist/dust-core-2.0.2.js
@@ -0,0 +1,660 @@
+//
+// Dust - Asynchronous Templating v2.0.2
+// http://akdubya.github.com/dustjs
+//
+// Copyright (c) 2010, Aleksander Williams
+// Released under the MIT License.
+//
+
+var dust = {};
+
+function getGlobal(){
+  return (function(){
+    return this.dust;
+  }).call(null);
+}
+
+(function(dust) {
+
+dust.helpers = {};
+
+dust.cache = {};
+
+dust.register = function(name, tmpl) {
+  if (!name) return;
+  dust.cache[name] = tmpl;
+};
+
+dust.render = function(name, context, callback) {
+  var chunk = new Stub(callback).head;
+  dust.load(name, chunk, Context.wrap(context, name)).end();
+};
+
+dust.stream = function(name, context) {
+  var stream = new Stream();
+  dust.nextTick(function() {
+    dust.load(name, stream.head, Context.wrap(context, name)).end();
+  });
+  return stream;
+};
+
+dust.renderSource = function(source, context, callback) {
+  return dust.compileFn(source)(context, callback);
+};
+
+dust.compileFn = function(source, name) {
+  var tmpl = dust.loadSource(dust.compile(source, name));
+  return function(context, callback) {
+    var master = callback ? new Stub(callback) : new Stream();
+    dust.nextTick(function() {
+      tmpl(master.head, Context.wrap(context, name)).end();
+    });
+    return master;
+  };
+};
+
+dust.load = function(name, chunk, context) {
+  var tmpl = dust.cache[name];
+  if (tmpl) {
+    return tmpl(chunk, context);
+  } else {
+    if (dust.onLoad) {
+      return chunk.map(function(chunk) {
+        dust.onLoad(name, function(err, src) {
+          if (err) return chunk.setError(err);
+          if (!dust.cache[name]) dust.loadSource(dust.compile(src, name));
+          dust.cache[name](chunk, context).end();
+        });
+      });
+    }
+    return chunk.setError(new Error("Template Not Found: " + name));
+  }
+};
+
+dust.loadSource = function(source, path) {
+  return eval(source);
+};
+
+if (Array.isArray) {
+  dust.isArray = Array.isArray;
+} else {
+  dust.isArray = function(arr) {
+    return Object.prototype.toString.call(arr) == "[object Array]";
+  };
+}
+
+dust.nextTick = (function() {
+  if (typeof process !== "undefined") {
+    return process.nextTick;
+  } else {
+    return function(callback) {
+      setTimeout(callback,0);
+    };
+  }
+} )();
+
+dust.isEmpty = function(value) {
+  if (dust.isArray(value) && !value.length) return true;
+  if (value === 0) return false;
+  return (!value);
+};
+
+// apply the filter chain and return the output string
+dust.filter = function(string, auto, filters) {
+  if (filters) {
+    for (var i=0, len=filters.length; i<len; i++) {
+      var name = filters[i];
+      if (name === "s") {
+        auto = null;
+      }
+      // fail silently for invalid filters
+      else if (typeof dust.filters[name] === 'function') {
+        string = dust.filters[name](string);
+      }
+    }
+  }
+  // by default always apply the h filter, unless asked to unescape with |s
+  if (auto) {
+    string = dust.filters[auto](string);
+  }
+  return string;
+};
+
+dust.filters = {
+  h: function(value) { return dust.escapeHtml(value); },
+  j: function(value) { return dust.escapeJs(value); },
+  u: encodeURI,
+  uc: encodeURIComponent,
+  js: function(value) { if (!JSON) { return value; } return JSON.stringify(value); },
+  jp: function(value) { if (!JSON) { return value; } return JSON.parse(value); }
+};
+
+function Context(stack, global, blocks) {
+  this.stack  = stack;
+  this.global = global;
+  this.blocks = blocks;
+}
+
+dust.makeBase = function(global) {
+  return new Context(new Stack(), global);
+};
+
+Context.wrap = function(context, name) {
+  if (context instanceof Context) {
+    return context;
+  }
+  var global= {};
+  global.__templates__ = [];
+  global.__templates__.push(name);
+  return new Context(new Stack(context), global);
+};
+
+Context.prototype.get = function(key) {
+  var ctx = this.stack, value;
+
+  while(ctx) {
+    if (ctx.isObject) {
+      value = ctx.head[key];
+      if (!(value === undefined)) {
+        return value;
+      }
+    }
+    ctx = ctx.tail;
+  }
+  return this.global ? this.global[key] : undefined;
+};
+
+//supports dot path resolution, function wrapped apply, and searching global paths
+Context.prototype.getPath = function(cur, down) {
+  var ctx = this.stack, ctxThis,
+      len = down.length,      
+      tail = cur ? undefined : this.stack.tail; 
+
+  if (cur && len === 0) return ctx.head;
+  ctx = ctx.head;
+  var i = 0;
+  while(ctx && i < len) {
+  	ctxThis = ctx;
+    ctx = ctx[down[i]];
+    i++;
+    while (!ctx && !cur){
+        //if there was a partial match, don't search further
+    	if (i > 1) return undefined;
+    	if (tail){
+    	  ctx = tail.head;
+    	  tail = tail.tail;
+    	  i=0;
+    	} else if (!cur) {
+    	  //finally search this.global.  we set cur to true to halt after
+      	  ctx = this.global;
+      	  cur = true;
+    	  i=0;
+    	}
+    }   
+  }
+  if (typeof ctx == 'function'){
+  	//wrap to preserve context 'this' see #174
+  	return function(){ 
+  	  return ctx.apply(ctxThis,arguments); 
+  	};
+  }
+  else {
+    return ctx;
+  }
+};
+
+Context.prototype.push = function(head, idx, len) {
+  return new Context(new Stack(head, this.stack, idx, len), this.global, this.blocks);
+};
+
+Context.prototype.rebase = function(head) {
+  return new Context(new Stack(head), this.global, this.blocks);
+};
+
+Context.prototype.current = function() {
+  return this.stack.head;
+};
+
+Context.prototype.getBlock = function(key, chk, ctx) {
+  if (typeof key === "function") {
+    key = key(chk, ctx).data.join("");
+    chk.data = []; //ie7 perf
+  }
+
+  var blocks = this.blocks;
+
+  if (!blocks) return;
+  var len = blocks.length, fn;
+  while (len--) {
+    fn = blocks[len][key];
+    if (fn) return fn;
+  }
+};
+
+Context.prototype.shiftBlocks = function(locals) {
+  var blocks = this.blocks,
+      newBlocks;
+
+  if (locals) {
+    if (!blocks) {
+      newBlocks = [locals];
+    } else {
+      newBlocks = blocks.concat([locals]);
+    }
+    return new Context(this.stack, this.global, newBlocks);
+  }
+  return this;
+};
+
+function Stack(head, tail, idx, len) {
+  this.tail = tail;
+  this.isObject = !dust.isArray(head) && head && typeof head === "object";
+  this.head = head;
+  this.index = idx;
+  this.of = len;
+}
+
+function Stub(callback) {
+  this.head = new Chunk(this);
+  this.callback = callback;
+  this.out = '';
+}
+
+Stub.prototype.flush = function() {
+  var chunk = this.head;
+
+  while (chunk) {
+    if (chunk.flushable) {
+      this.out += chunk.data.join(""); //ie7 perf
+    } else if (chunk.error) {
+      this.callback(chunk.error);
+      this.flush = function() {};
+      return;
+    } else {
+      return;
+    }
+    chunk = chunk.next;
+    this.head = chunk;
+  }
+  this.callback(null, this.out);
+};
+
+function Stream() {
+  this.head = new Chunk(this);
+}
+
+Stream.prototype.flush = function() {
+  var chunk = this.head;
+
+  while(chunk) {
+    if (chunk.flushable) {
+      this.emit('data', chunk.data.join("")); //ie7 perf
+    } else if (chunk.error) {
+      this.emit('error', chunk.error);
+      this.flush = function() {};
+      return;
+    } else {
+      return;
+    }
+    chunk = chunk.next;
+    this.head = chunk;
+  }
+  this.emit('end');
+};
+
+Stream.prototype.emit = function(type, data) {
+  if (!this.events) return false;
+  var handler = this.events[type];
+  if (!handler) return false;
+  if (typeof handler == 'function') {
+    handler(data);
+  } else {
+    var listeners = handler.slice(0);
+    for (var i = 0, l = listeners.length; i < l; i++) {
+      listeners[i](data);
+    }
+  }
+};
+
+Stream.prototype.on = function(type, callback) {
+  if (!this.events) {
+    this.events = {};
+  }
+  if (!this.events[type]) {
+    this.events[type] = callback;
+  } else if(typeof this.events[type] === 'function') {
+    this.events[type] = [this.events[type], callback];
+  } else {
+    this.events[type].push(callback);
+  }
+  return this;
+};
+
+Stream.prototype.pipe = function(stream) {
+  this.on("data", function(data) {
+    stream.write(data, "utf8");
+  }).on("end", function() {
+    stream.end();
+  }).on("error", function(err) {
+    stream.error(err);
+  });
+  return this;
+};
+
+function Chunk(root, next, taps) {
+  this.root = root;
+  this.next = next;
+  this.data = []; //ie7 perf
+  this.flushable = false;
+  this.taps = taps;
+}
+
+Chunk.prototype.write = function(data) {
+  var taps  = this.taps;
+
+  if (taps) {
+    data = taps.go(data);
+  }
+  this.data.push(data);
+  return this;
+};
+
+Chunk.prototype.end = function(data) {
+  if (data) {
+    this.write(data);
+  }
+  this.flushable = true;
+  this.root.flush();
+  return this;
+};
+
+Chunk.prototype.map = function(callback) {
+  var cursor = new Chunk(this.root, this.next, this.taps),
+      branch = new Chunk(this.root, cursor, this.taps);
+
+  this.next = branch;
+  this.flushable = true;
+  callback(branch);
+  return cursor;
+};
+
+Chunk.prototype.tap = function(tap) {
+  var taps = this.taps;
+
+  if (taps) {
+    this.taps = taps.push(tap);
+  } else {
+    this.taps = new Tap(tap);
+  }
+  return this;
+};
+
+Chunk.prototype.untap = function() {
+  this.taps = this.taps.tail;
+  return this;
+};
+
+Chunk.prototype.render = function(body, context) {
+  return body(this, context);
+};
+
+Chunk.prototype.reference = function(elem, context, auto, filters) {
+  if (typeof elem === "function") {
+    elem.isFunction = true;
+    // Changed the function calling to use apply with the current context to make sure 
+    // that "this" is wat we expect it to be inside the function
+    elem = elem.apply(context.current(), [this, context, null, {auto: auto, filters: filters}]);
+    if (elem instanceof Chunk) {
+      return elem;
+    }
+  }
+  if (!dust.isEmpty(elem)) {
+    return this.write(dust.filter(elem, auto, filters));
+  } else {
+    return this;
+  }
+};
+
+Chunk.prototype.section = function(elem, context, bodies, params) {
+  // anonymous functions
+  if (typeof elem === "function") {
+    elem = elem.apply(context.current(), [this, context, bodies, params]);
+    // functions that return chunks are assumed to have handled the body and/or have modified the chunk
+    // use that return value as the current chunk and go to the next method in the chain
+    if (elem instanceof Chunk) {
+      return elem;
+    }
+  }
+  var body = bodies.block,
+      skip = bodies['else'];
+
+  // a.k.a Inline parameters in the Dust documentations
+  if (params) {
+    context = context.push(params);
+  }
+
+  /*
+  Dust's default behavior is to enumerate over the array elem, passing each object in the array to the block.
+  When elem resolves to a value or object instead of an array, Dust sets the current context to the value 
+  and renders the block one time.
+  */
+  //non empty array is truthy, empty array is falsy
+  if (dust.isArray(elem)) {
+     if (body) {
+      var len = elem.length, chunk = this;
+      if (len > 0) {
+        // any custom helper can blow up the stack 
+        // and store a flattened context, guard defensively
+        if(context.stack.head) {
+         context.stack.head['$len'] = len;
+        }
+        for (var i=0; i<len; i++) {
+          if(context.stack.head) {
+           context.stack.head['$idx'] = i;
+          }
+          chunk = body(chunk, context.push(elem[i], i, len));
+        }
+        if(context.stack.head) {
+         context.stack.head['$idx'] = undefined;
+         context.stack.head['$len'] = undefined;
+        }
+        return chunk;
+      } 
+      else if (skip) {
+         return skip(this, context);
+      }
+     }
+   }
+   // true is truthy but does not change context
+   else if (elem  === true) {
+     if (body) { 
+        return body(this, context);
+     }
+   }
+   // everything that evaluates to true are truthy ( e.g. Non-empty strings and Empty objects are truthy. )
+   // zero is truthy
+   // for anonymous functions that did not returns a chunk, truthiness is evaluated based on the return value
+   //
+   else if (elem || elem === 0) {
+     if (body) return body(this, context.push(elem));
+   // nonexistent, scalar false value, scalar empty string, null,
+   // undefined are all falsy
+  } else if (skip) {
+     return skip(this, context);
+   }  
+  return this;
+};
+
+Chunk.prototype.exists = function(elem, context, bodies) {
+  var body = bodies.block,
+      skip = bodies['else'];
+
+  if (!dust.isEmpty(elem)) {
+    if (body) return body(this, context);
+  } else if (skip) {
+    return skip(this, context);
+  }
+  return this;
+};
+
+Chunk.prototype.notexists = function(elem, context, bodies) {
+  var body = bodies.block,
+      skip = bodies['else'];
+
+  if (dust.isEmpty(elem)) {
+    if (body) return body(this, context);
+  } else if (skip) {
+    return skip(this, context);
+  }
+  return this;
+};
+
+Chunk.prototype.block = function(elem, context, bodies) {
+  var body = bodies.block;
+
+  if (elem) {
+    body = elem;
+  }
+
+  if (body) {
+    return body(this, context);
+  }
+  return this;
+};
+
+Chunk.prototype.partial = function(elem, context, params) {
+  var partialContext;
+  if(context.global && context.global.__templates__){
+   context.global.__templates__.push(elem);
+  } 
+  if (params){
+    //put the params context second to match what section does. {.} matches the current context without parameters
+    // start with an empty context
+    partialContext = dust.makeBase(context.global);
+    partialContext.blocks = context.blocks;
+    if (context.stack && context.stack.tail){
+      // grab the stack(tail) off of the previous context if we have it
+      partialContext.stack = context.stack.tail;
+    }
+    //put params on
+    partialContext = partialContext.push(params);
+    //reattach the head
+    partialContext = partialContext.push(context.stack.head);
+  } else {
+    partialContext = context;
+  }
+  var partialChunk;
+   if (typeof elem === "function") {
+     partialChunk = this.capture(elem, partialContext, function(name, chunk) {
+       dust.load(name, chunk, partialContext).end();
+     });
+   }
+   else {
+     partialChunk = dust.load(elem, this, partialContext);
+   }
+   if(context.global && context.global.__templates__) {
+    context.global.__templates__.pop();
+   }
+   return partialChunk;
+};
+
+Chunk.prototype.helper = function(name, context, bodies, params) {
+  // handle invalid helpers, similar to invalid filters
+  if( dust.helpers[name]){
+   return dust.helpers[name](this, context, bodies, params);
+  } else {
+    return this;
+  }
+};
+
+Chunk.prototype.capture = function(body, context, callback) {
+  return this.map(function(chunk) {
+    var stub = new Stub(function(err, out) {
+      if (err) {
+        chunk.setError(err);
+      } else {
+        callback(out, chunk);
+      }
+    });
+    body(stub.head, context).end();
+  });
+};
+
+Chunk.prototype.setError = function(err) {
+  this.error = err;
+  this.root.flush();
+  return this;
+};
+
+function Tap(head, tail) {
+  this.head = head;
+  this.tail = tail;
+}
+
+Tap.prototype.push = function(tap) {
+  return new Tap(tap, this);
+};
+
+Tap.prototype.go = function(value) {
+  var tap = this;
+
+  while(tap) {
+    value = tap.head(value);
+    tap = tap.tail;
+  }
+  return value;
+};
+
+var HCHARS = new RegExp(/[&<>\"\']/),
+    AMP    = /&/g,
+    LT     = /</g,
+    GT     = />/g,
+    QUOT   = /\"/g,
+    SQUOT  = /\'/g;
+
+dust.escapeHtml = function(s) {
+  if (typeof s === "string") {
+    if (!HCHARS.test(s)) {
+      return s;
+    }
+    return s.replace(AMP,'&amp;').replace(LT,'&lt;').replace(GT,'&gt;').replace(QUOT,'&quot;').replace(SQUOT, '&#39;');
+  }
+  return s;
+};
+
+var BS = /\\/g,
+    FS = /\//g,
+    CR = /\r/g,
+    LS = /\u2028/g,
+    PS = /\u2029/g,
+    NL = /\n/g,
+    LF = /\f/g,
+    SQ = /'/g,
+    DQ = /"/g,
+    TB = /\t/g;
+
+dust.escapeJs = function(s) {
+  if (typeof s === "string") {
+    return s
+      .replace(BS, '\\\\')
+      .replace(FS, '\\/')
+      .replace(DQ, '\\"')
+      .replace(SQ, "\\'")
+      .replace(CR, '\\r')
+      .replace(LS, '\\u2028')
+      .replace(PS, '\\u2029')
+      .replace(NL, '\\n')
+      .replace(LF, '\\f')
+      .replace(TB, "\\t");
+  }
+  return s;
+};
+
+})(dust);
+
+if (typeof exports !== "undefined") {
+  if (typeof process !== "undefined") {
+      require('./server')(dust);
+  }
+  module.exports = dust;
+}
diff --git a/dist/dust-full-2.0.2.js b/dist/dust-full-2.0.2.js
new file mode 100644
index 00000000..cc2add7a
--- /dev/null
+++ b/dist/dust-full-2.0.2.js
@@ -0,0 +1,3636 @@
+//
+// Dust - Asynchronous Templating v2.0.2
+// http://akdubya.github.com/dustjs
+//
+// Copyright (c) 2010, Aleksander Williams
+// Released under the MIT License.
+//
+
+var dust = {};
+
+function getGlobal(){
+  return (function(){
+    return this.dust;
+  }).call(null);
+}
+
+(function(dust) {
+
+dust.helpers = {};
+
+dust.cache = {};
+
+dust.register = function(name, tmpl) {
+  if (!name) return;
+  dust.cache[name] = tmpl;
+};
+
+dust.render = function(name, context, callback) {
+  var chunk = new Stub(callback).head;
+  dust.load(name, chunk, Context.wrap(context, name)).end();
+};
+
+dust.stream = function(name, context) {
+  var stream = new Stream();
+  dust.nextTick(function() {
+    dust.load(name, stream.head, Context.wrap(context, name)).end();
+  });
+  return stream;
+};
+
+dust.renderSource = function(source, context, callback) {
+  return dust.compileFn(source)(context, callback);
+};
+
+dust.compileFn = function(source, name) {
+  var tmpl = dust.loadSource(dust.compile(source, name));
+  return function(context, callback) {
+    var master = callback ? new Stub(callback) : new Stream();
+    dust.nextTick(function() {
+      tmpl(master.head, Context.wrap(context, name)).end();
+    });
+    return master;
+  };
+};
+
+dust.load = function(name, chunk, context) {
+  var tmpl = dust.cache[name];
+  if (tmpl) {
+    return tmpl(chunk, context);
+  } else {
+    if (dust.onLoad) {
+      return chunk.map(function(chunk) {
+        dust.onLoad(name, function(err, src) {
+          if (err) return chunk.setError(err);
+          if (!dust.cache[name]) dust.loadSource(dust.compile(src, name));
+          dust.cache[name](chunk, context).end();
+        });
+      });
+    }
+    return chunk.setError(new Error("Template Not Found: " + name));
+  }
+};
+
+dust.loadSource = function(source, path) {
+  return eval(source);
+};
+
+if (Array.isArray) {
+  dust.isArray = Array.isArray;
+} else {
+  dust.isArray = function(arr) {
+    return Object.prototype.toString.call(arr) == "[object Array]";
+  };
+}
+
+dust.nextTick = (function() {
+  if (typeof process !== "undefined") {
+    return process.nextTick;
+  } else {
+    return function(callback) {
+      setTimeout(callback,0);
+    };
+  }
+} )();
+
+dust.isEmpty = function(value) {
+  if (dust.isArray(value) && !value.length) return true;
+  if (value === 0) return false;
+  return (!value);
+};
+
+// apply the filter chain and return the output string
+dust.filter = function(string, auto, filters) {
+  if (filters) {
+    for (var i=0, len=filters.length; i<len; i++) {
+      var name = filters[i];
+      if (name === "s") {
+        auto = null;
+      }
+      // fail silently for invalid filters
+      else if (typeof dust.filters[name] === 'function') {
+        string = dust.filters[name](string);
+      }
+    }
+  }
+  // by default always apply the h filter, unless asked to unescape with |s
+  if (auto) {
+    string = dust.filters[auto](string);
+  }
+  return string;
+};
+
+dust.filters = {
+  h: function(value) { return dust.escapeHtml(value); },
+  j: function(value) { return dust.escapeJs(value); },
+  u: encodeURI,
+  uc: encodeURIComponent,
+  js: function(value) { if (!JSON) { return value; } return JSON.stringify(value); },
+  jp: function(value) { if (!JSON) { return value; } return JSON.parse(value); }
+};
+
+function Context(stack, global, blocks) {
+  this.stack  = stack;
+  this.global = global;
+  this.blocks = blocks;
+}
+
+dust.makeBase = function(global) {
+  return new Context(new Stack(), global);
+};
+
+Context.wrap = function(context, name) {
+  if (context instanceof Context) {
+    return context;
+  }
+  var global= {};
+  global.__templates__ = [];
+  global.__templates__.push(name);
+  return new Context(new Stack(context), global);
+};
+
+Context.prototype.get = function(key) {
+  var ctx = this.stack, value;
+
+  while(ctx) {
+    if (ctx.isObject) {
+      value = ctx.head[key];
+      if (!(value === undefined)) {
+        return value;
+      }
+    }
+    ctx = ctx.tail;
+  }
+  return this.global ? this.global[key] : undefined;
+};
+
+//supports dot path resolution, function wrapped apply, and searching global paths
+Context.prototype.getPath = function(cur, down) {
+  var ctx = this.stack, ctxThis,
+      len = down.length,      
+      tail = cur ? undefined : this.stack.tail; 
+
+  if (cur && len === 0) return ctx.head;
+  ctx = ctx.head;
+  var i = 0;
+  while(ctx && i < len) {
+  	ctxThis = ctx;
+    ctx = ctx[down[i]];
+    i++;
+    while (!ctx && !cur){
+        //if there was a partial match, don't search further
+    	if (i > 1) return undefined;
+    	if (tail){
+    	  ctx = tail.head;
+    	  tail = tail.tail;
+    	  i=0;
+    	} else if (!cur) {
+    	  //finally search this.global.  we set cur to true to halt after
+      	  ctx = this.global;
+      	  cur = true;
+    	  i=0;
+    	}
+    }   
+  }
+  if (typeof ctx == 'function'){
+  	//wrap to preserve context 'this' see #174
+  	return function(){ 
+  	  return ctx.apply(ctxThis,arguments); 
+  	};
+  }
+  else {
+    return ctx;
+  }
+};
+
+Context.prototype.push = function(head, idx, len) {
+  return new Context(new Stack(head, this.stack, idx, len), this.global, this.blocks);
+};
+
+Context.prototype.rebase = function(head) {
+  return new Context(new Stack(head), this.global, this.blocks);
+};
+
+Context.prototype.current = function() {
+  return this.stack.head;
+};
+
+Context.prototype.getBlock = function(key, chk, ctx) {
+  if (typeof key === "function") {
+    key = key(chk, ctx).data.join("");
+    chk.data = []; //ie7 perf
+  }
+
+  var blocks = this.blocks;
+
+  if (!blocks) return;
+  var len = blocks.length, fn;
+  while (len--) {
+    fn = blocks[len][key];
+    if (fn) return fn;
+  }
+};
+
+Context.prototype.shiftBlocks = function(locals) {
+  var blocks = this.blocks,
+      newBlocks;
+
+  if (locals) {
+    if (!blocks) {
+      newBlocks = [locals];
+    } else {
+      newBlocks = blocks.concat([locals]);
+    }
+    return new Context(this.stack, this.global, newBlocks);
+  }
+  return this;
+};
+
+function Stack(head, tail, idx, len) {
+  this.tail = tail;
+  this.isObject = !dust.isArray(head) && head && typeof head === "object";
+  this.head = head;
+  this.index = idx;
+  this.of = len;
+}
+
+function Stub(callback) {
+  this.head = new Chunk(this);
+  this.callback = callback;
+  this.out = '';
+}
+
+Stub.prototype.flush = function() {
+  var chunk = this.head;
+
+  while (chunk) {
+    if (chunk.flushable) {
+      this.out += chunk.data.join(""); //ie7 perf
+    } else if (chunk.error) {
+      this.callback(chunk.error);
+      this.flush = function() {};
+      return;
+    } else {
+      return;
+    }
+    chunk = chunk.next;
+    this.head = chunk;
+  }
+  this.callback(null, this.out);
+};
+
+function Stream() {
+  this.head = new Chunk(this);
+}
+
+Stream.prototype.flush = function() {
+  var chunk = this.head;
+
+  while(chunk) {
+    if (chunk.flushable) {
+      this.emit('data', chunk.data.join("")); //ie7 perf
+    } else if (chunk.error) {
+      this.emit('error', chunk.error);
+      this.flush = function() {};
+      return;
+    } else {
+      return;
+    }
+    chunk = chunk.next;
+    this.head = chunk;
+  }
+  this.emit('end');
+};
+
+Stream.prototype.emit = function(type, data) {
+  if (!this.events) return false;
+  var handler = this.events[type];
+  if (!handler) return false;
+  if (typeof handler == 'function') {
+    handler(data);
+  } else {
+    var listeners = handler.slice(0);
+    for (var i = 0, l = listeners.length; i < l; i++) {
+      listeners[i](data);
+    }
+  }
+};
+
+Stream.prototype.on = function(type, callback) {
+  if (!this.events) {
+    this.events = {};
+  }
+  if (!this.events[type]) {
+    this.events[type] = callback;
+  } else if(typeof this.events[type] === 'function') {
+    this.events[type] = [this.events[type], callback];
+  } else {
+    this.events[type].push(callback);
+  }
+  return this;
+};
+
+Stream.prototype.pipe = function(stream) {
+  this.on("data", function(data) {
+    stream.write(data, "utf8");
+  }).on("end", function() {
+    stream.end();
+  }).on("error", function(err) {
+    stream.error(err);
+  });
+  return this;
+};
+
+function Chunk(root, next, taps) {
+  this.root = root;
+  this.next = next;
+  this.data = []; //ie7 perf
+  this.flushable = false;
+  this.taps = taps;
+}
+
+Chunk.prototype.write = function(data) {
+  var taps  = this.taps;
+
+  if (taps) {
+    data = taps.go(data);
+  }
+  this.data.push(data);
+  return this;
+};
+
+Chunk.prototype.end = function(data) {
+  if (data) {
+    this.write(data);
+  }
+  this.flushable = true;
+  this.root.flush();
+  return this;
+};
+
+Chunk.prototype.map = function(callback) {
+  var cursor = new Chunk(this.root, this.next, this.taps),
+      branch = new Chunk(this.root, cursor, this.taps);
+
+  this.next = branch;
+  this.flushable = true;
+  callback(branch);
+  return cursor;
+};
+
+Chunk.prototype.tap = function(tap) {
+  var taps = this.taps;
+
+  if (taps) {
+    this.taps = taps.push(tap);
+  } else {
+    this.taps = new Tap(tap);
+  }
+  return this;
+};
+
+Chunk.prototype.untap = function() {
+  this.taps = this.taps.tail;
+  return this;
+};
+
+Chunk.prototype.render = function(body, context) {
+  return body(this, context);
+};
+
+Chunk.prototype.reference = function(elem, context, auto, filters) {
+  if (typeof elem === "function") {
+    elem.isFunction = true;
+    // Changed the function calling to use apply with the current context to make sure 
+    // that "this" is wat we expect it to be inside the function
+    elem = elem.apply(context.current(), [this, context, null, {auto: auto, filters: filters}]);
+    if (elem instanceof Chunk) {
+      return elem;
+    }
+  }
+  if (!dust.isEmpty(elem)) {
+    return this.write(dust.filter(elem, auto, filters));
+  } else {
+    return this;
+  }
+};
+
+Chunk.prototype.section = function(elem, context, bodies, params) {
+  // anonymous functions
+  if (typeof elem === "function") {
+    elem = elem.apply(context.current(), [this, context, bodies, params]);
+    // functions that return chunks are assumed to have handled the body and/or have modified the chunk
+    // use that return value as the current chunk and go to the next method in the chain
+    if (elem instanceof Chunk) {
+      return elem;
+    }
+  }
+  var body = bodies.block,
+      skip = bodies['else'];
+
+  // a.k.a Inline parameters in the Dust documentations
+  if (params) {
+    context = context.push(params);
+  }
+
+  /*
+  Dust's default behavior is to enumerate over the array elem, passing each object in the array to the block.
+  When elem resolves to a value or object instead of an array, Dust sets the current context to the value 
+  and renders the block one time.
+  */
+  //non empty array is truthy, empty array is falsy
+  if (dust.isArray(elem)) {
+     if (body) {
+      var len = elem.length, chunk = this;
+      if (len > 0) {
+        // any custom helper can blow up the stack 
+        // and store a flattened context, guard defensively
+        if(context.stack.head) {
+         context.stack.head['$len'] = len;
+        }
+        for (var i=0; i<len; i++) {
+          if(context.stack.head) {
+           context.stack.head['$idx'] = i;
+          }
+          chunk = body(chunk, context.push(elem[i], i, len));
+        }
+        if(context.stack.head) {
+         context.stack.head['$idx'] = undefined;
+         context.stack.head['$len'] = undefined;
+        }
+        return chunk;
+      } 
+      else if (skip) {
+         return skip(this, context);
+      }
+     }
+   }
+   // true is truthy but does not change context
+   else if (elem  === true) {
+     if (body) { 
+        return body(this, context);
+     }
+   }
+   // everything that evaluates to true are truthy ( e.g. Non-empty strings and Empty objects are truthy. )
+   // zero is truthy
+   // for anonymous functions that did not returns a chunk, truthiness is evaluated based on the return value
+   //
+   else if (elem || elem === 0) {
+     if (body) return body(this, context.push(elem));
+   // nonexistent, scalar false value, scalar empty string, null,
+   // undefined are all falsy
+  } else if (skip) {
+     return skip(this, context);
+   }  
+  return this;
+};
+
+Chunk.prototype.exists = function(elem, context, bodies) {
+  var body = bodies.block,
+      skip = bodies['else'];
+
+  if (!dust.isEmpty(elem)) {
+    if (body) return body(this, context);
+  } else if (skip) {
+    return skip(this, context);
+  }
+  return this;
+};
+
+Chunk.prototype.notexists = function(elem, context, bodies) {
+  var body = bodies.block,
+      skip = bodies['else'];
+
+  if (dust.isEmpty(elem)) {
+    if (body) return body(this, context);
+  } else if (skip) {
+    return skip(this, context);
+  }
+  return this;
+};
+
+Chunk.prototype.block = function(elem, context, bodies) {
+  var body = bodies.block;
+
+  if (elem) {
+    body = elem;
+  }
+
+  if (body) {
+    return body(this, context);
+  }
+  return this;
+};
+
+Chunk.prototype.partial = function(elem, context, params) {
+  var partialContext;
+  if(context.global && context.global.__templates__){
+   context.global.__templates__.push(elem);
+  } 
+  if (params){
+    //put the params context second to match what section does. {.} matches the current context without parameters
+    // start with an empty context
+    partialContext = dust.makeBase(context.global);
+    partialContext.blocks = context.blocks;
+    if (context.stack && context.stack.tail){
+      // grab the stack(tail) off of the previous context if we have it
+      partialContext.stack = context.stack.tail;
+    }
+    //put params on
+    partialContext = partialContext.push(params);
+    //reattach the head
+    partialContext = partialContext.push(context.stack.head);
+  } else {
+    partialContext = context;
+  }
+  var partialChunk;
+   if (typeof elem === "function") {
+     partialChunk = this.capture(elem, partialContext, function(name, chunk) {
+       dust.load(name, chunk, partialContext).end();
+     });
+   }
+   else {
+     partialChunk = dust.load(elem, this, partialContext);
+   }
+   if(context.global && context.global.__templates__) {
+    context.global.__templates__.pop();
+   }
+   return partialChunk;
+};
+
+Chunk.prototype.helper = function(name, context, bodies, params) {
+  // handle invalid helpers, similar to invalid filters
+  if( dust.helpers[name]){
+   return dust.helpers[name](this, context, bodies, params);
+  } else {
+    return this;
+  }
+};
+
+Chunk.prototype.capture = function(body, context, callback) {
+  return this.map(function(chunk) {
+    var stub = new Stub(function(err, out) {
+      if (err) {
+        chunk.setError(err);
+      } else {
+        callback(out, chunk);
+      }
+    });
+    body(stub.head, context).end();
+  });
+};
+
+Chunk.prototype.setError = function(err) {
+  this.error = err;
+  this.root.flush();
+  return this;
+};
+
+function Tap(head, tail) {
+  this.head = head;
+  this.tail = tail;
+}
+
+Tap.prototype.push = function(tap) {
+  return new Tap(tap, this);
+};
+
+Tap.prototype.go = function(value) {
+  var tap = this;
+
+  while(tap) {
+    value = tap.head(value);
+    tap = tap.tail;
+  }
+  return value;
+};
+
+var HCHARS = new RegExp(/[&<>\"\']/),
+    AMP    = /&/g,
+    LT     = /</g,
+    GT     = />/g,
+    QUOT   = /\"/g,
+    SQUOT  = /\'/g;
+
+dust.escapeHtml = function(s) {
+  if (typeof s === "string") {
+    if (!HCHARS.test(s)) {
+      return s;
+    }
+    return s.replace(AMP,'&amp;').replace(LT,'&lt;').replace(GT,'&gt;').replace(QUOT,'&quot;').replace(SQUOT, '&#39;');
+  }
+  return s;
+};
+
+var BS = /\\/g,
+    FS = /\//g,
+    CR = /\r/g,
+    LS = /\u2028/g,
+    PS = /\u2029/g,
+    NL = /\n/g,
+    LF = /\f/g,
+    SQ = /'/g,
+    DQ = /"/g,
+    TB = /\t/g;
+
+dust.escapeJs = function(s) {
+  if (typeof s === "string") {
+    return s
+      .replace(BS, '\\\\')
+      .replace(FS, '\\/')
+      .replace(DQ, '\\"')
+      .replace(SQ, "\\'")
+      .replace(CR, '\\r')
+      .replace(LS, '\\u2028')
+      .replace(PS, '\\u2029')
+      .replace(NL, '\\n')
+      .replace(LF, '\\f')
+      .replace(TB, "\\t");
+  }
+  return s;
+};
+
+})(dust);
+
+if (typeof exports !== "undefined") {
+  if (typeof process !== "undefined") {
+      require('./server')(dust);
+  }
+  module.exports = dust;
+}
+var dustCompiler = (function(dust) {
+
+dust.compile = function(source, name) {
+  try {
+    var ast = filterAST(dust.parse(source));
+    return compile(ast, name);
+  }
+  catch(err)
+  {
+    if(!err.line || !err.column) throw err;    
+    throw new SyntaxError(err.message + " At line : " + err.line + ", column : " + err.column);
+  }
+};
+
+function filterAST(ast) {
+  var context = {};
+  return dust.filterNode(context, ast);
+};
+
+dust.filterNode = function(context, node) {
+  return dust.optimizers[node[0]](context, node);
+};
+
+dust.optimizers = {
+  body:      compactBuffers,
+  buffer:    noop,
+  special:   convertSpecial,
+  format:    nullify,        // TODO: convert format
+  reference: visit,
+  "#":       visit,
+  "?":       visit,
+  "^":       visit,
+  "<":       visit,
+  "+":       visit,
+  "@":       visit,
+  "%":       visit,
+  partial:   visit,
+  context:   visit,
+  params:    visit,
+  bodies:    visit,
+  param:     visit,
+  filters:   noop,
+  key:       noop,
+  path:      noop,
+  literal:   noop,
+  comment:   nullify,
+  line: nullify,
+  col: nullify
+};
+
+dust.pragmas = {
+  esc: function(compiler, context, bodies, params) {
+    var old = compiler.auto;
+    if (!context) context = 'h';
+    compiler.auto = (context === 's') ? '' : context;
+    var out = compileParts(compiler, bodies.block);
+    compiler.auto = old;
+    return out;
+  }
+};
+
+function visit(context, node) {
+  var out = [node[0]];
+  for (var i=1, len=node.length; i<len; i++) {
+    var res = dust.filterNode(context, node[i]);
+    if (res) out.push(res);
+  }
+  return out;
+};
+
+// Compacts consecutive buffer nodes into a single node
+function compactBuffers(context, node) {
+  var out = [node[0]], memo;
+  for (var i=1, len=node.length; i<len; i++) {
+    var res = dust.filterNode(context, node[i]);
+    if (res) {
+      if (res[0] === 'buffer') {
+        if (memo) {
+          memo[1] += res[1];
+        } else {
+          memo = res;
+          out.push(res);
+        }
+      } else {
+        memo = null;
+        out.push(res);
+      }
+    }
+  }
+  return out;
+};
+
+var specialChars = {
+  "s": " ",
+  "n": "\n",
+  "r": "\r",
+  "lb": "{",
+  "rb": "}"
+};
+
+function convertSpecial(context, node) { return ['buffer', specialChars[node[1]]] };
+function noop(context, node) { return node };
+function nullify(){};
+
+function compile(ast, name) {
+  var context = {
+    name: name,
+    bodies: [],
+    blocks: {},
+    index: 0,
+    auto: "h"
+  }
+
+  return "(function(){dust.register("
+    + (name ? "\"" + name + "\"" : "null") + ","
+    + dust.compileNode(context, ast)
+    + ");"
+    + compileBlocks(context)
+    + compileBodies(context)
+    + "return body_0;"
+    + "})();";
+};
+
+function compileBlocks(context) {
+  var out = [],
+      blocks = context.blocks;
+
+  for (var name in blocks) {
+    out.push("'" + name + "':" + blocks[name]);
+  }
+  if (out.length) {
+    context.blocks = "ctx=ctx.shiftBlocks(blocks);";
+    return "var blocks={" + out.join(',') + "};";
+  }
+  return context.blocks = "";
+};
+
+function compileBodies(context) {
+  var out = [],
+      bodies = context.bodies,
+      blx = context.blocks;
+
+  for (var i=0, len=bodies.length; i<len; i++) {
+    out[i] = "function body_" + i + "(chk,ctx){"
+      + blx + "return chk" + bodies[i] + ";}";
+  }
+  return out.join('');
+};
+
+function compileParts(context, body) {
+  var parts = '';
+  for (var i=1, len=body.length; i<len; i++) {
+    parts += dust.compileNode(context, body[i]);
+  }
+  return parts;
+};
+
+dust.compileNode = function(context, node) {
+  return dust.nodes[node[0]](context, node);
+};
+
+dust.nodes = {
+  body: function(context, node) {
+    var id = context.index++, name = "body_" + id;
+    context.bodies[id] = compileParts(context, node);
+    return name;
+  },
+
+  buffer: function(context, node) {
+    return ".write(" + escape(node[1]) + ")";
+  },
+
+  format: function(context, node) {
+    return ".write(" + escape(node[1] + node[2]) + ")";
+  },
+
+  reference: function(context, node) {
+    return ".reference(" + dust.compileNode(context, node[1])
+      + ",ctx," + dust.compileNode(context, node[2]) + ")";
+  },
+
+  "#": function(context, node) {
+    return compileSection(context, node, "section");
+  },
+
+  "?": function(context, node) {
+    return compileSection(context, node, "exists");
+  },
+
+  "^": function(context, node) {
+    return compileSection(context, node, "notexists");
+  },
+
+  "<": function(context, node) {
+    var bodies = node[4];
+    for (var i=1, len=bodies.length; i<len; i++) {
+      var param = bodies[i],
+          type = param[1][1];
+      if (type === "block") {
+        context.blocks[node[1].text] = dust.compileNode(context, param[2]);
+        return '';
+      }
+    }
+    return '';
+  },
+
+  "+": function(context, node) {
+    if(typeof(node[1].text) === "undefined"  && typeof(node[4]) === "undefined"){
+      return ".block(ctx.getBlock("
+      + dust.compileNode(context, node[1])
+      + ",chk, ctx)," + dust.compileNode(context, node[2]) + ", {},"
+      + dust.compileNode(context, node[3])
+      + ")";
+    }else {
+      return ".block(ctx.getBlock("
+      + escape(node[1].text)
+      + ")," + dust.compileNode(context, node[2]) + ","
+      + dust.compileNode(context, node[4]) + ","
+      + dust.compileNode(context, node[3])
+      + ")";
+    }
+  },
+
+  "@": function(context, node) {
+    return ".helper("
+      + escape(node[1].text)
+      + "," + dust.compileNode(context, node[2]) + ","
+      + dust.compileNode(context, node[4]) + ","
+      + dust.compileNode(context, node[3])
+      + ")";
+  },
+
+  "%": function(context, node) {
+    // TODO: Move these hacks into pragma precompiler
+    var name = node[1][1];
+    if (!dust.pragmas[name]) return '';
+
+    var rawBodies = node[4];
+    var bodies = {};
+    for (var i=1, len=rawBodies.length; i<len; i++) {
+      var b = rawBodies[i];
+      bodies[b[1][1]] = b[2];
+    }
+
+    var rawParams = node[3];
+    var params = {};
+    for (var i=1, len=rawParams.length; i<len; i++) {
+      var p = rawParams[i];
+      params[p[1][1]] = p[2][1];
+    }
+
+    var ctx = node[2][1] ? node[2][1].text : null;
+
+    return dust.pragmas[name](context, ctx, bodies, params);
+  },
+
+  partial: function(context, node) {
+    return ".partial("
+      + dust.compileNode(context, node[1])
+      + "," + dust.compileNode(context, node[2])
+      + "," + dust.compileNode(context, node[3]) + ")";
+  },
+
+  context: function(context, node) {
+    if (node[1]) {
+      return "ctx.rebase(" + dust.compileNode(context, node[1]) + ")";
+    }
+    return "ctx";
+  },
+
+  params: function(context, node) {
+    var out = [];
+    for (var i=1, len=node.length; i<len; i++) {
+      out.push(dust.compileNode(context, node[i]));
+    }
+    if (out.length) {
+      return "{" + out.join(',') + "}";
+    }
+    return "null";
+  },
+
+  bodies: function(context, node) {
+    var out = [];
+    for (var i=1, len=node.length; i<len; i++) {
+      out.push(dust.compileNode(context, node[i]));
+    }
+    return "{" + out.join(',') + "}";
+  },
+
+  param: function(context, node) {
+    return dust.compileNode(context, node[1]) + ":" + dust.compileNode(context, node[2]);
+  },
+
+  filters: function(context, node) {
+    var list = [];
+    for (var i=1, len=node.length; i<len; i++) {
+      var filter = node[i];
+      list.push("\"" + filter + "\"");
+    }
+    return "\"" + context.auto + "\""
+      + (list.length ? ",[" + list.join(',') + "]" : '');
+  },
+
+  key: function(context, node) {
+    return "ctx.get(\"" + node[1] + "\")";
+  },
+
+  path: function(context, node) {
+    var current = node[1],
+        keys = node[2],
+        list = [];
+
+    for (var i=0,len=keys.length; i<len; i++) {
+      if (dust.isArray(keys[i]))
+        list.push(dust.compileNode(context, keys[i]));
+      else
+        list.push("\"" + keys[i] + "\"");
+    }
+    return "ctx.getPath(" + current + ",[" + list.join(',') + "])";
+  },
+
+  literal: function(context, node) {
+    return escape(node[1]);
+  }
+};
+
+function compileSection(context, node, cmd) {
+  return "." + cmd + "("
+    + dust.compileNode(context, node[1])
+    + "," + dust.compileNode(context, node[2]) + ","
+    + dust.compileNode(context, node[4]) + ","
+    + dust.compileNode(context, node[3])
+    + ")";
+};
+
+var escape = (typeof JSON === "undefined")
+  ? function(str) { return "\"" + dust.escapeJs(str) + "\"" }
+  : JSON.stringify;
+
+  return dust;
+
+});
+
+if (typeof exports !== 'undefined') {
+  module.exports = dustCompiler;
+} else {
+  dustCompiler(getGlobal());
+}
+(function(dust){
+
+var parser = (function(){
+  /*
+   * Generated by PEG.js 0.7.0.
+   *
+   * http://pegjs.majda.cz/
+   */
+  
+  function quote(s) {
+    /*
+     * ECMA-262, 5th ed., 7.8.4: All characters may appear literally in a
+     * string literal except for the closing quote character, backslash,
+     * carriage return, line separator, paragraph separator, and line feed.
+     * Any character may appear in the form of an escape sequence.
+     *
+     * For portability, we also escape escape all control and non-ASCII
+     * characters. Note that "\0" and "\v" escape sequences are not used
+     * because JSHint does not like the first and IE the second.
+     */
+     return '"' + s
+      .replace(/\\/g, '\\\\')  // backslash
+      .replace(/"/g, '\\"')    // closing quote character
+      .replace(/\x08/g, '\\b') // backspace
+      .replace(/\t/g, '\\t')   // horizontal tab
+      .replace(/\n/g, '\\n')   // line feed
+      .replace(/\f/g, '\\f')   // form feed
+      .replace(/\r/g, '\\r')   // carriage return
+      .replace(/[\x00-\x07\x0B\x0E-\x1F\x80-\uFFFF]/g, escape)
+      + '"';
+  }
+  
+  var result = {
+    /*
+     * Parses the input with a generated parser. If the parsing is successfull,
+     * returns a value explicitly or implicitly specified by the grammar from
+     * which the parser was generated (see |PEG.buildParser|). If the parsing is
+     * unsuccessful, throws |PEG.parser.SyntaxError| describing the error.
+     */
+    parse: function(input, startRule) {
+      var parseFunctions = {
+        "body": parse_body,
+        "part": parse_part,
+        "section": parse_section,
+        "sec_tag_start": parse_sec_tag_start,
+        "end_tag": parse_end_tag,
+        "context": parse_context,
+        "params": parse_params,
+        "bodies": parse_bodies,
+        "reference": parse_reference,
+        "partial": parse_partial,
+        "filters": parse_filters,
+        "special": parse_special,
+        "identifier": parse_identifier,
+        "number": parse_number,
+        "float": parse_float,
+        "integer": parse_integer,
+        "path": parse_path,
+        "key": parse_key,
+        "array": parse_array,
+        "array_part": parse_array_part,
+        "inline": parse_inline,
+        "inline_part": parse_inline_part,
+        "buffer": parse_buffer,
+        "literal": parse_literal,
+        "esc": parse_esc,
+        "comment": parse_comment,
+        "tag": parse_tag,
+        "ld": parse_ld,
+        "rd": parse_rd,
+        "lb": parse_lb,
+        "rb": parse_rb,
+        "eol": parse_eol,
+        "ws": parse_ws
+      };
+      
+      if (startRule !== undefined) {
+        if (parseFunctions[startRule] === undefined) {
+          throw new Error("Invalid rule name: " + quote(startRule) + ".");
+        }
+      } else {
+        startRule = "body";
+      }
+      
+      var pos = { offset: 0, line: 1, column: 1, seenCR: false };
+      var reportFailures = 0;
+      var rightmostFailuresPos = { offset: 0, line: 1, column: 1, seenCR: false };
+      var rightmostFailuresExpected = [];
+      
+      function padLeft(input, padding, length) {
+        var result = input;
+        
+        var padLength = length - input.length;
+        for (var i = 0; i < padLength; i++) {
+          result = padding + result;
+        }
+        
+        return result;
+      }
+      
+      function escape(ch) {
+        var charCode = ch.charCodeAt(0);
+        var escapeChar;
+        var length;
+        
+        if (charCode <= 0xFF) {
+          escapeChar = 'x';
+          length = 2;
+        } else {
+          escapeChar = 'u';
+          length = 4;
+        }
+        
+        return '\\' + escapeChar + padLeft(charCode.toString(16).toUpperCase(), '0', length);
+      }
+      
+      function clone(object) {
+        var result = {};
+        for (var key in object) {
+          result[key] = object[key];
+        }
+        return result;
+      }
+      
+      function advance(pos, n) {
+        var endOffset = pos.offset + n;
+        
+        for (var offset = pos.offset; offset < endOffset; offset++) {
+          var ch = input.charAt(offset);
+          if (ch === "\n") {
+            if (!pos.seenCR) { pos.line++; }
+            pos.column = 1;
+            pos.seenCR = false;
+          } else if (ch === "\r" || ch === "\u2028" || ch === "\u2029") {
+            pos.line++;
+            pos.column = 1;
+            pos.seenCR = true;
+          } else {
+            pos.column++;
+            pos.seenCR = false;
+          }
+        }
+        
+        pos.offset += n;
+      }
+      
+      function matchFailed(failure) {
+        if (pos.offset < rightmostFailuresPos.offset) {
+          return;
+        }
+        
+        if (pos.offset > rightmostFailuresPos.offset) {
+          rightmostFailuresPos = clone(pos);
+          rightmostFailuresExpected = [];
+        }
+        
+        rightmostFailuresExpected.push(failure);
+      }
+      
+      function parse_body() {
+        var result0, result1;
+        var pos0;
+        
+        pos0 = clone(pos);
+        result0 = [];
+        result1 = parse_part();
+        while (result1 !== null) {
+          result0.push(result1);
+          result1 = parse_part();
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, p) { return ["body"].concat(p).concat([['line', line], ['col', column]]) })(pos0.offset, pos0.line, pos0.column, result0);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        return result0;
+      }
+      
+      function parse_part() {
+        var result0;
+        
+        result0 = parse_comment();
+        if (result0 === null) {
+          result0 = parse_section();
+          if (result0 === null) {
+            result0 = parse_partial();
+            if (result0 === null) {
+              result0 = parse_special();
+              if (result0 === null) {
+                result0 = parse_reference();
+                if (result0 === null) {
+                  result0 = parse_buffer();
+                }
+              }
+            }
+          }
+        }
+        return result0;
+      }
+      
+      function parse_section() {
+        var result0, result1, result2, result3, result4, result5, result6;
+        var pos0, pos1;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        result0 = parse_sec_tag_start();
+        if (result0 !== null) {
+          result1 = [];
+          result2 = parse_ws();
+          while (result2 !== null) {
+            result1.push(result2);
+            result2 = parse_ws();
+          }
+          if (result1 !== null) {
+            result2 = parse_rd();
+            if (result2 !== null) {
+              result3 = parse_body();
+              if (result3 !== null) {
+                result4 = parse_bodies();
+                if (result4 !== null) {
+                  result5 = parse_end_tag();
+                  result5 = result5 !== null ? result5 : "";
+                  if (result5 !== null) {
+                    result6 = (function(offset, line, column, t, b, e, n) {if( (!n) || (t[1].text !== n.text) ) { throw new Error("Expected end tag for "+t[1].text+" but it was not found. At line : "+line+", column : " + column)} return true;})(pos.offset, pos.line, pos.column, result0, result3, result4, result5) ? "" : null;
+                    if (result6 !== null) {
+                      result0 = [result0, result1, result2, result3, result4, result5, result6];
+                    } else {
+                      result0 = null;
+                      pos = clone(pos1);
+                    }
+                  } else {
+                    result0 = null;
+                    pos = clone(pos1);
+                  }
+                } else {
+                  result0 = null;
+                  pos = clone(pos1);
+                }
+              } else {
+                result0 = null;
+                pos = clone(pos1);
+              }
+            } else {
+              result0 = null;
+              pos = clone(pos1);
+            }
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos1);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, t, b, e, n) { e.push(["param", ["literal", "block"], b]); t.push(e); return t.concat([['line', line], ['col', column]]) })(pos0.offset, pos0.line, pos0.column, result0[0], result0[3], result0[4], result0[5]);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        if (result0 === null) {
+          pos0 = clone(pos);
+          pos1 = clone(pos);
+          result0 = parse_sec_tag_start();
+          if (result0 !== null) {
+            result1 = [];
+            result2 = parse_ws();
+            while (result2 !== null) {
+              result1.push(result2);
+              result2 = parse_ws();
+            }
+            if (result1 !== null) {
+              if (input.charCodeAt(pos.offset) === 47) {
+                result2 = "/";
+                advance(pos, 1);
+              } else {
+                result2 = null;
+                if (reportFailures === 0) {
+                  matchFailed("\"/\"");
+                }
+              }
+              if (result2 !== null) {
+                result3 = parse_rd();
+                if (result3 !== null) {
+                  result0 = [result0, result1, result2, result3];
+                } else {
+                  result0 = null;
+                  pos = clone(pos1);
+                }
+              } else {
+                result0 = null;
+                pos = clone(pos1);
+              }
+            } else {
+              result0 = null;
+              pos = clone(pos1);
+            }
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+          if (result0 !== null) {
+            result0 = (function(offset, line, column, t) { t.push(["bodies"]); return t.concat([['line', line], ['col', column]]) })(pos0.offset, pos0.line, pos0.column, result0[0]);
+          }
+          if (result0 === null) {
+            pos = clone(pos0);
+          }
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("section");
+        }
+        return result0;
+      }
+      
+      function parse_sec_tag_start() {
+        var result0, result1, result2, result3, result4, result5;
+        var pos0, pos1;
+        
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        result0 = parse_ld();
+        if (result0 !== null) {
+          if (/^[#?^<+@%]/.test(input.charAt(pos.offset))) {
+            result1 = input.charAt(pos.offset);
+            advance(pos, 1);
+          } else {
+            result1 = null;
+            if (reportFailures === 0) {
+              matchFailed("[#?^<+@%]");
+            }
+          }
+          if (result1 !== null) {
+            result2 = [];
+            result3 = parse_ws();
+            while (result3 !== null) {
+              result2.push(result3);
+              result3 = parse_ws();
+            }
+            if (result2 !== null) {
+              result3 = parse_identifier();
+              if (result3 !== null) {
+                result4 = parse_context();
+                if (result4 !== null) {
+                  result5 = parse_params();
+                  if (result5 !== null) {
+                    result0 = [result0, result1, result2, result3, result4, result5];
+                  } else {
+                    result0 = null;
+                    pos = clone(pos1);
+                  }
+                } else {
+                  result0 = null;
+                  pos = clone(pos1);
+                }
+              } else {
+                result0 = null;
+                pos = clone(pos1);
+              }
+            } else {
+              result0 = null;
+              pos = clone(pos1);
+            }
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos1);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, t, n, c, p) { return [t, n, c, p] })(pos0.offset, pos0.line, pos0.column, result0[1], result0[3], result0[4], result0[5]);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        return result0;
+      }
+      
+      function parse_end_tag() {
+        var result0, result1, result2, result3, result4, result5;
+        var pos0, pos1;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        result0 = parse_ld();
+        if (result0 !== null) {
+          if (input.charCodeAt(pos.offset) === 47) {
+            result1 = "/";
+            advance(pos, 1);
+          } else {
+            result1 = null;
+            if (reportFailures === 0) {
+              matchFailed("\"/\"");
+            }
+          }
+          if (result1 !== null) {
+            result2 = [];
+            result3 = parse_ws();
+            while (result3 !== null) {
+              result2.push(result3);
+              result3 = parse_ws();
+            }
+            if (result2 !== null) {
+              result3 = parse_identifier();
+              if (result3 !== null) {
+                result4 = [];
+                result5 = parse_ws();
+                while (result5 !== null) {
+                  result4.push(result5);
+                  result5 = parse_ws();
+                }
+                if (result4 !== null) {
+                  result5 = parse_rd();
+                  if (result5 !== null) {
+                    result0 = [result0, result1, result2, result3, result4, result5];
+                  } else {
+                    result0 = null;
+                    pos = clone(pos1);
+                  }
+                } else {
+                  result0 = null;
+                  pos = clone(pos1);
+                }
+              } else {
+                result0 = null;
+                pos = clone(pos1);
+              }
+            } else {
+              result0 = null;
+              pos = clone(pos1);
+            }
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos1);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, n) { return n })(pos0.offset, pos0.line, pos0.column, result0[3]);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("end tag");
+        }
+        return result0;
+      }
+      
+      function parse_context() {
+        var result0, result1;
+        var pos0, pos1, pos2;
+        
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        pos2 = clone(pos);
+        if (input.charCodeAt(pos.offset) === 58) {
+          result0 = ":";
+          advance(pos, 1);
+        } else {
+          result0 = null;
+          if (reportFailures === 0) {
+            matchFailed("\":\"");
+          }
+        }
+        if (result0 !== null) {
+          result1 = parse_identifier();
+          if (result1 !== null) {
+            result0 = [result0, result1];
+          } else {
+            result0 = null;
+            pos = clone(pos2);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos2);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, n) {return n})(pos1.offset, pos1.line, pos1.column, result0[1]);
+        }
+        if (result0 === null) {
+          pos = clone(pos1);
+        }
+        result0 = result0 !== null ? result0 : "";
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, n) { return n ? ["context", n] : ["context"] })(pos0.offset, pos0.line, pos0.column, result0);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        return result0;
+      }
+      
+      function parse_params() {
+        var result0, result1, result2, result3, result4;
+        var pos0, pos1, pos2;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        result0 = [];
+        pos1 = clone(pos);
+        pos2 = clone(pos);
+        result2 = parse_ws();
+        if (result2 !== null) {
+          result1 = [];
+          while (result2 !== null) {
+            result1.push(result2);
+            result2 = parse_ws();
+          }
+        } else {
+          result1 = null;
+        }
+        if (result1 !== null) {
+          result2 = parse_key();
+          if (result2 !== null) {
+            if (input.charCodeAt(pos.offset) === 61) {
+              result3 = "=";
+              advance(pos, 1);
+            } else {
+              result3 = null;
+              if (reportFailures === 0) {
+                matchFailed("\"=\"");
+              }
+            }
+            if (result3 !== null) {
+              result4 = parse_number();
+              if (result4 === null) {
+                result4 = parse_identifier();
+                if (result4 === null) {
+                  result4 = parse_inline();
+                }
+              }
+              if (result4 !== null) {
+                result1 = [result1, result2, result3, result4];
+              } else {
+                result1 = null;
+                pos = clone(pos2);
+              }
+            } else {
+              result1 = null;
+              pos = clone(pos2);
+            }
+          } else {
+            result1 = null;
+            pos = clone(pos2);
+          }
+        } else {
+          result1 = null;
+          pos = clone(pos2);
+        }
+        if (result1 !== null) {
+          result1 = (function(offset, line, column, k, v) {return ["param", ["literal", k], v]})(pos1.offset, pos1.line, pos1.column, result1[1], result1[3]);
+        }
+        if (result1 === null) {
+          pos = clone(pos1);
+        }
+        while (result1 !== null) {
+          result0.push(result1);
+          pos1 = clone(pos);
+          pos2 = clone(pos);
+          result2 = parse_ws();
+          if (result2 !== null) {
+            result1 = [];
+            while (result2 !== null) {
+              result1.push(result2);
+              result2 = parse_ws();
+            }
+          } else {
+            result1 = null;
+          }
+          if (result1 !== null) {
+            result2 = parse_key();
+            if (result2 !== null) {
+              if (input.charCodeAt(pos.offset) === 61) {
+                result3 = "=";
+                advance(pos, 1);
+              } else {
+                result3 = null;
+                if (reportFailures === 0) {
+                  matchFailed("\"=\"");
+                }
+              }
+              if (result3 !== null) {
+                result4 = parse_number();
+                if (result4 === null) {
+                  result4 = parse_identifier();
+                  if (result4 === null) {
+                    result4 = parse_inline();
+                  }
+                }
+                if (result4 !== null) {
+                  result1 = [result1, result2, result3, result4];
+                } else {
+                  result1 = null;
+                  pos = clone(pos2);
+                }
+              } else {
+                result1 = null;
+                pos = clone(pos2);
+              }
+            } else {
+              result1 = null;
+              pos = clone(pos2);
+            }
+          } else {
+            result1 = null;
+            pos = clone(pos2);
+          }
+          if (result1 !== null) {
+            result1 = (function(offset, line, column, k, v) {return ["param", ["literal", k], v]})(pos1.offset, pos1.line, pos1.column, result1[1], result1[3]);
+          }
+          if (result1 === null) {
+            pos = clone(pos1);
+          }
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, p) { return ["params"].concat(p) })(pos0.offset, pos0.line, pos0.column, result0);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("params");
+        }
+        return result0;
+      }
+      
+      function parse_bodies() {
+        var result0, result1, result2, result3, result4, result5;
+        var pos0, pos1, pos2;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        result0 = [];
+        pos1 = clone(pos);
+        pos2 = clone(pos);
+        result1 = parse_ld();
+        if (result1 !== null) {
+          if (input.charCodeAt(pos.offset) === 58) {
+            result2 = ":";
+            advance(pos, 1);
+          } else {
+            result2 = null;
+            if (reportFailures === 0) {
+              matchFailed("\":\"");
+            }
+          }
+          if (result2 !== null) {
+            result3 = parse_key();
+            if (result3 !== null) {
+              result4 = parse_rd();
+              if (result4 !== null) {
+                result5 = parse_body();
+                if (result5 !== null) {
+                  result1 = [result1, result2, result3, result4, result5];
+                } else {
+                  result1 = null;
+                  pos = clone(pos2);
+                }
+              } else {
+                result1 = null;
+                pos = clone(pos2);
+              }
+            } else {
+              result1 = null;
+              pos = clone(pos2);
+            }
+          } else {
+            result1 = null;
+            pos = clone(pos2);
+          }
+        } else {
+          result1 = null;
+          pos = clone(pos2);
+        }
+        if (result1 !== null) {
+          result1 = (function(offset, line, column, k, v) {return ["param", ["literal", k], v]})(pos1.offset, pos1.line, pos1.column, result1[2], result1[4]);
+        }
+        if (result1 === null) {
+          pos = clone(pos1);
+        }
+        while (result1 !== null) {
+          result0.push(result1);
+          pos1 = clone(pos);
+          pos2 = clone(pos);
+          result1 = parse_ld();
+          if (result1 !== null) {
+            if (input.charCodeAt(pos.offset) === 58) {
+              result2 = ":";
+              advance(pos, 1);
+            } else {
+              result2 = null;
+              if (reportFailures === 0) {
+                matchFailed("\":\"");
+              }
+            }
+            if (result2 !== null) {
+              result3 = parse_key();
+              if (result3 !== null) {
+                result4 = parse_rd();
+                if (result4 !== null) {
+                  result5 = parse_body();
+                  if (result5 !== null) {
+                    result1 = [result1, result2, result3, result4, result5];
+                  } else {
+                    result1 = null;
+                    pos = clone(pos2);
+                  }
+                } else {
+                  result1 = null;
+                  pos = clone(pos2);
+                }
+              } else {
+                result1 = null;
+                pos = clone(pos2);
+              }
+            } else {
+              result1 = null;
+              pos = clone(pos2);
+            }
+          } else {
+            result1 = null;
+            pos = clone(pos2);
+          }
+          if (result1 !== null) {
+            result1 = (function(offset, line, column, k, v) {return ["param", ["literal", k], v]})(pos1.offset, pos1.line, pos1.column, result1[2], result1[4]);
+          }
+          if (result1 === null) {
+            pos = clone(pos1);
+          }
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, p) { return ["bodies"].concat(p) })(pos0.offset, pos0.line, pos0.column, result0);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("bodies");
+        }
+        return result0;
+      }
+      
+      function parse_reference() {
+        var result0, result1, result2, result3;
+        var pos0, pos1;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        result0 = parse_ld();
+        if (result0 !== null) {
+          result1 = parse_identifier();
+          if (result1 !== null) {
+            result2 = parse_filters();
+            if (result2 !== null) {
+              result3 = parse_rd();
+              if (result3 !== null) {
+                result0 = [result0, result1, result2, result3];
+              } else {
+                result0 = null;
+                pos = clone(pos1);
+              }
+            } else {
+              result0 = null;
+              pos = clone(pos1);
+            }
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos1);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, n, f) { return ["reference", n, f].concat([['line', line], ['col', column]]) })(pos0.offset, pos0.line, pos0.column, result0[1], result0[2]);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("reference");
+        }
+        return result0;
+      }
+      
+      function parse_partial() {
+        var result0, result1, result2, result3, result4, result5, result6, result7, result8;
+        var pos0, pos1, pos2;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        result0 = parse_ld();
+        if (result0 !== null) {
+          if (input.charCodeAt(pos.offset) === 62) {
+            result1 = ">";
+            advance(pos, 1);
+          } else {
+            result1 = null;
+            if (reportFailures === 0) {
+              matchFailed("\">\"");
+            }
+          }
+          if (result1 === null) {
+            if (input.charCodeAt(pos.offset) === 43) {
+              result1 = "+";
+              advance(pos, 1);
+            } else {
+              result1 = null;
+              if (reportFailures === 0) {
+                matchFailed("\"+\"");
+              }
+            }
+          }
+          if (result1 !== null) {
+            result2 = [];
+            result3 = parse_ws();
+            while (result3 !== null) {
+              result2.push(result3);
+              result3 = parse_ws();
+            }
+            if (result2 !== null) {
+              pos2 = clone(pos);
+              result3 = parse_key();
+              if (result3 !== null) {
+                result3 = (function(offset, line, column, k) {return ["literal", k]})(pos2.offset, pos2.line, pos2.column, result3);
+              }
+              if (result3 === null) {
+                pos = clone(pos2);
+              }
+              if (result3 === null) {
+                result3 = parse_inline();
+              }
+              if (result3 !== null) {
+                result4 = parse_context();
+                if (result4 !== null) {
+                  result5 = parse_params();
+                  if (result5 !== null) {
+                    result6 = [];
+                    result7 = parse_ws();
+                    while (result7 !== null) {
+                      result6.push(result7);
+                      result7 = parse_ws();
+                    }
+                    if (result6 !== null) {
+                      if (input.charCodeAt(pos.offset) === 47) {
+                        result7 = "/";
+                        advance(pos, 1);
+                      } else {
+                        result7 = null;
+                        if (reportFailures === 0) {
+                          matchFailed("\"/\"");
+                        }
+                      }
+                      if (result7 !== null) {
+                        result8 = parse_rd();
+                        if (result8 !== null) {
+                          result0 = [result0, result1, result2, result3, result4, result5, result6, result7, result8];
+                        } else {
+                          result0 = null;
+                          pos = clone(pos1);
+                        }
+                      } else {
+                        result0 = null;
+                        pos = clone(pos1);
+                      }
+                    } else {
+                      result0 = null;
+                      pos = clone(pos1);
+                    }
+                  } else {
+                    result0 = null;
+                    pos = clone(pos1);
+                  }
+                } else {
+                  result0 = null;
+                  pos = clone(pos1);
+                }
+              } else {
+                result0 = null;
+                pos = clone(pos1);
+              }
+            } else {
+              result0 = null;
+              pos = clone(pos1);
+            }
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos1);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, s, n, c, p) { var key = (s ===">")? "partial" : s; return [key, n, c, p].concat([['line', line], ['col', column]]) })(pos0.offset, pos0.line, pos0.column, result0[1], result0[3], result0[4], result0[5]);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("partial");
+        }
+        return result0;
+      }
+      
+      function parse_filters() {
+        var result0, result1, result2;
+        var pos0, pos1, pos2;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        result0 = [];
+        pos1 = clone(pos);
+        pos2 = clone(pos);
+        if (input.charCodeAt(pos.offset) === 124) {
+          result1 = "|";
+          advance(pos, 1);
+        } else {
+          result1 = null;
+          if (reportFailures === 0) {
+            matchFailed("\"|\"");
+          }
+        }
+        if (result1 !== null) {
+          result2 = parse_key();
+          if (result2 !== null) {
+            result1 = [result1, result2];
+          } else {
+            result1 = null;
+            pos = clone(pos2);
+          }
+        } else {
+          result1 = null;
+          pos = clone(pos2);
+        }
+        if (result1 !== null) {
+          result1 = (function(offset, line, column, n) {return n})(pos1.offset, pos1.line, pos1.column, result1[1]);
+        }
+        if (result1 === null) {
+          pos = clone(pos1);
+        }
+        while (result1 !== null) {
+          result0.push(result1);
+          pos1 = clone(pos);
+          pos2 = clone(pos);
+          if (input.charCodeAt(pos.offset) === 124) {
+            result1 = "|";
+            advance(pos, 1);
+          } else {
+            result1 = null;
+            if (reportFailures === 0) {
+              matchFailed("\"|\"");
+            }
+          }
+          if (result1 !== null) {
+            result2 = parse_key();
+            if (result2 !== null) {
+              result1 = [result1, result2];
+            } else {
+              result1 = null;
+              pos = clone(pos2);
+            }
+          } else {
+            result1 = null;
+            pos = clone(pos2);
+          }
+          if (result1 !== null) {
+            result1 = (function(offset, line, column, n) {return n})(pos1.offset, pos1.line, pos1.column, result1[1]);
+          }
+          if (result1 === null) {
+            pos = clone(pos1);
+          }
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, f) { return ["filters"].concat(f) })(pos0.offset, pos0.line, pos0.column, result0);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("filters");
+        }
+        return result0;
+      }
+      
+      function parse_special() {
+        var result0, result1, result2, result3;
+        var pos0, pos1;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        result0 = parse_ld();
+        if (result0 !== null) {
+          if (input.charCodeAt(pos.offset) === 126) {
+            result1 = "~";
+            advance(pos, 1);
+          } else {
+            result1 = null;
+            if (reportFailures === 0) {
+              matchFailed("\"~\"");
+            }
+          }
+          if (result1 !== null) {
+            result2 = parse_key();
+            if (result2 !== null) {
+              result3 = parse_rd();
+              if (result3 !== null) {
+                result0 = [result0, result1, result2, result3];
+              } else {
+                result0 = null;
+                pos = clone(pos1);
+              }
+            } else {
+              result0 = null;
+              pos = clone(pos1);
+            }
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos1);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, k) { return ["special", k].concat([['line', line], ['col', column]]) })(pos0.offset, pos0.line, pos0.column, result0[2]);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("special");
+        }
+        return result0;
+      }
+      
+      function parse_identifier() {
+        var result0;
+        var pos0;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        result0 = parse_path();
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, p) { var arr = ["path"].concat(p); arr.text = p[1].join('.'); return arr; })(pos0.offset, pos0.line, pos0.column, result0);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        if (result0 === null) {
+          pos0 = clone(pos);
+          result0 = parse_key();
+          if (result0 !== null) {
+            result0 = (function(offset, line, column, k) { var arr = ["key", k]; arr.text = k; return arr; })(pos0.offset, pos0.line, pos0.column, result0);
+          }
+          if (result0 === null) {
+            pos = clone(pos0);
+          }
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("identifier");
+        }
+        return result0;
+      }
+      
+      function parse_number() {
+        var result0;
+        var pos0;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        result0 = parse_float();
+        if (result0 === null) {
+          result0 = parse_integer();
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, n) { return ['literal', n]; })(pos0.offset, pos0.line, pos0.column, result0);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("number");
+        }
+        return result0;
+      }
+      
+      function parse_float() {
+        var result0, result1, result2, result3;
+        var pos0, pos1;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        result0 = parse_integer();
+        if (result0 !== null) {
+          if (input.charCodeAt(pos.offset) === 46) {
+            result1 = ".";
+            advance(pos, 1);
+          } else {
+            result1 = null;
+            if (reportFailures === 0) {
+              matchFailed("\".\"");
+            }
+          }
+          if (result1 !== null) {
+            result3 = parse_integer();
+            if (result3 !== null) {
+              result2 = [];
+              while (result3 !== null) {
+                result2.push(result3);
+                result3 = parse_integer();
+              }
+            } else {
+              result2 = null;
+            }
+            if (result2 !== null) {
+              result0 = [result0, result1, result2];
+            } else {
+              result0 = null;
+              pos = clone(pos1);
+            }
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos1);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, l, r) { return parseFloat(l + "." + r.join('')); })(pos0.offset, pos0.line, pos0.column, result0[0], result0[2]);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("float");
+        }
+        return result0;
+      }
+      
+      function parse_integer() {
+        var result0, result1;
+        var pos0;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        if (/^[0-9]/.test(input.charAt(pos.offset))) {
+          result1 = input.charAt(pos.offset);
+          advance(pos, 1);
+        } else {
+          result1 = null;
+          if (reportFailures === 0) {
+            matchFailed("[0-9]");
+          }
+        }
+        if (result1 !== null) {
+          result0 = [];
+          while (result1 !== null) {
+            result0.push(result1);
+            if (/^[0-9]/.test(input.charAt(pos.offset))) {
+              result1 = input.charAt(pos.offset);
+              advance(pos, 1);
+            } else {
+              result1 = null;
+              if (reportFailures === 0) {
+                matchFailed("[0-9]");
+              }
+            }
+          }
+        } else {
+          result0 = null;
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, digits) { return parseInt(digits.join(""), 10); })(pos0.offset, pos0.line, pos0.column, result0);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("integer");
+        }
+        return result0;
+      }
+      
+      function parse_path() {
+        var result0, result1, result2;
+        var pos0, pos1;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        result0 = parse_key();
+        result0 = result0 !== null ? result0 : "";
+        if (result0 !== null) {
+          result2 = parse_array_part();
+          if (result2 === null) {
+            result2 = parse_array();
+          }
+          if (result2 !== null) {
+            result1 = [];
+            while (result2 !== null) {
+              result1.push(result2);
+              result2 = parse_array_part();
+              if (result2 === null) {
+                result2 = parse_array();
+              }
+            }
+          } else {
+            result1 = null;
+          }
+          if (result1 !== null) {
+            result0 = [result0, result1];
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos1);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, k, d) {
+            d = d[0];
+            if (k && d) {
+              d.unshift(k);
+              return [false, d].concat([['line', line], ['col', column]]);
+            }
+            return [true, d].concat([['line', line], ['col', column]]);
+          })(pos0.offset, pos0.line, pos0.column, result0[0], result0[1]);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        if (result0 === null) {
+          pos0 = clone(pos);
+          pos1 = clone(pos);
+          if (input.charCodeAt(pos.offset) === 46) {
+            result0 = ".";
+            advance(pos, 1);
+          } else {
+            result0 = null;
+            if (reportFailures === 0) {
+              matchFailed("\".\"");
+            }
+          }
+          if (result0 !== null) {
+            result1 = [];
+            result2 = parse_array_part();
+            if (result2 === null) {
+              result2 = parse_array();
+            }
+            while (result2 !== null) {
+              result1.push(result2);
+              result2 = parse_array_part();
+              if (result2 === null) {
+                result2 = parse_array();
+              }
+            }
+            if (result1 !== null) {
+              result0 = [result0, result1];
+            } else {
+              result0 = null;
+              pos = clone(pos1);
+            }
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+          if (result0 !== null) {
+            result0 = (function(offset, line, column, d) {
+              if (d.length > 0) {
+                return [true, d[0]].concat([['line', line], ['col', column]]);
+              }
+              return [true, []].concat([['line', line], ['col', column]]);
+            })(pos0.offset, pos0.line, pos0.column, result0[1]);
+          }
+          if (result0 === null) {
+            pos = clone(pos0);
+          }
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("path");
+        }
+        return result0;
+      }
+      
+      function parse_key() {
+        var result0, result1, result2;
+        var pos0, pos1;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        if (/^[a-zA-Z_$]/.test(input.charAt(pos.offset))) {
+          result0 = input.charAt(pos.offset);
+          advance(pos, 1);
+        } else {
+          result0 = null;
+          if (reportFailures === 0) {
+            matchFailed("[a-zA-Z_$]");
+          }
+        }
+        if (result0 !== null) {
+          result1 = [];
+          if (/^[0-9a-zA-Z_$\-]/.test(input.charAt(pos.offset))) {
+            result2 = input.charAt(pos.offset);
+            advance(pos, 1);
+          } else {
+            result2 = null;
+            if (reportFailures === 0) {
+              matchFailed("[0-9a-zA-Z_$\\-]");
+            }
+          }
+          while (result2 !== null) {
+            result1.push(result2);
+            if (/^[0-9a-zA-Z_$\-]/.test(input.charAt(pos.offset))) {
+              result2 = input.charAt(pos.offset);
+              advance(pos, 1);
+            } else {
+              result2 = null;
+              if (reportFailures === 0) {
+                matchFailed("[0-9a-zA-Z_$\\-]");
+              }
+            }
+          }
+          if (result1 !== null) {
+            result0 = [result0, result1];
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos1);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, h, t) { return h + t.join('') })(pos0.offset, pos0.line, pos0.column, result0[0], result0[1]);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("key");
+        }
+        return result0;
+      }
+      
+      function parse_array() {
+        var result0, result1, result2;
+        var pos0, pos1, pos2, pos3, pos4;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        pos2 = clone(pos);
+        pos3 = clone(pos);
+        result0 = parse_lb();
+        if (result0 !== null) {
+          pos4 = clone(pos);
+          if (/^[0-9]/.test(input.charAt(pos.offset))) {
+            result2 = input.charAt(pos.offset);
+            advance(pos, 1);
+          } else {
+            result2 = null;
+            if (reportFailures === 0) {
+              matchFailed("[0-9]");
+            }
+          }
+          if (result2 !== null) {
+            result1 = [];
+            while (result2 !== null) {
+              result1.push(result2);
+              if (/^[0-9]/.test(input.charAt(pos.offset))) {
+                result2 = input.charAt(pos.offset);
+                advance(pos, 1);
+              } else {
+                result2 = null;
+                if (reportFailures === 0) {
+                  matchFailed("[0-9]");
+                }
+              }
+            }
+          } else {
+            result1 = null;
+          }
+          if (result1 !== null) {
+            result1 = (function(offset, line, column, n) {return n.join('')})(pos4.offset, pos4.line, pos4.column, result1);
+          }
+          if (result1 === null) {
+            pos = clone(pos4);
+          }
+          if (result1 === null) {
+            result1 = parse_identifier();
+          }
+          if (result1 !== null) {
+            result2 = parse_rb();
+            if (result2 !== null) {
+              result0 = [result0, result1, result2];
+            } else {
+              result0 = null;
+              pos = clone(pos3);
+            }
+          } else {
+            result0 = null;
+            pos = clone(pos3);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos3);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, a) {return a; })(pos2.offset, pos2.line, pos2.column, result0[1]);
+        }
+        if (result0 === null) {
+          pos = clone(pos2);
+        }
+        if (result0 !== null) {
+          result1 = parse_array_part();
+          result1 = result1 !== null ? result1 : "";
+          if (result1 !== null) {
+            result0 = [result0, result1];
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos1);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, i, nk) { if(nk) { nk.unshift(i); } else {nk = [i] } return nk; })(pos0.offset, pos0.line, pos0.column, result0[0], result0[1]);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("array");
+        }
+        return result0;
+      }
+      
+      function parse_array_part() {
+        var result0, result1, result2;
+        var pos0, pos1, pos2, pos3;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        pos2 = clone(pos);
+        pos3 = clone(pos);
+        if (input.charCodeAt(pos.offset) === 46) {
+          result1 = ".";
+          advance(pos, 1);
+        } else {
+          result1 = null;
+          if (reportFailures === 0) {
+            matchFailed("\".\"");
+          }
+        }
+        if (result1 !== null) {
+          result2 = parse_key();
+          if (result2 !== null) {
+            result1 = [result1, result2];
+          } else {
+            result1 = null;
+            pos = clone(pos3);
+          }
+        } else {
+          result1 = null;
+          pos = clone(pos3);
+        }
+        if (result1 !== null) {
+          result1 = (function(offset, line, column, k) {return k})(pos2.offset, pos2.line, pos2.column, result1[1]);
+        }
+        if (result1 === null) {
+          pos = clone(pos2);
+        }
+        if (result1 !== null) {
+          result0 = [];
+          while (result1 !== null) {
+            result0.push(result1);
+            pos2 = clone(pos);
+            pos3 = clone(pos);
+            if (input.charCodeAt(pos.offset) === 46) {
+              result1 = ".";
+              advance(pos, 1);
+            } else {
+              result1 = null;
+              if (reportFailures === 0) {
+                matchFailed("\".\"");
+              }
+            }
+            if (result1 !== null) {
+              result2 = parse_key();
+              if (result2 !== null) {
+                result1 = [result1, result2];
+              } else {
+                result1 = null;
+                pos = clone(pos3);
+              }
+            } else {
+              result1 = null;
+              pos = clone(pos3);
+            }
+            if (result1 !== null) {
+              result1 = (function(offset, line, column, k) {return k})(pos2.offset, pos2.line, pos2.column, result1[1]);
+            }
+            if (result1 === null) {
+              pos = clone(pos2);
+            }
+          }
+        } else {
+          result0 = null;
+        }
+        if (result0 !== null) {
+          result1 = parse_array();
+          result1 = result1 !== null ? result1 : "";
+          if (result1 !== null) {
+            result0 = [result0, result1];
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos1);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, d, a) { if (a) { return d.concat(a); } else { return d; } })(pos0.offset, pos0.line, pos0.column, result0[0], result0[1]);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("array_part");
+        }
+        return result0;
+      }
+      
+      function parse_inline() {
+        var result0, result1, result2;
+        var pos0, pos1;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        if (input.charCodeAt(pos.offset) === 34) {
+          result0 = "\"";
+          advance(pos, 1);
+        } else {
+          result0 = null;
+          if (reportFailures === 0) {
+            matchFailed("\"\\\"\"");
+          }
+        }
+        if (result0 !== null) {
+          if (input.charCodeAt(pos.offset) === 34) {
+            result1 = "\"";
+            advance(pos, 1);
+          } else {
+            result1 = null;
+            if (reportFailures === 0) {
+              matchFailed("\"\\\"\"");
+            }
+          }
+          if (result1 !== null) {
+            result0 = [result0, result1];
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos1);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column) { return ["literal", ""].concat([['line', line], ['col', column]]) })(pos0.offset, pos0.line, pos0.column);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        if (result0 === null) {
+          pos0 = clone(pos);
+          pos1 = clone(pos);
+          if (input.charCodeAt(pos.offset) === 34) {
+            result0 = "\"";
+            advance(pos, 1);
+          } else {
+            result0 = null;
+            if (reportFailures === 0) {
+              matchFailed("\"\\\"\"");
+            }
+          }
+          if (result0 !== null) {
+            result1 = parse_literal();
+            if (result1 !== null) {
+              if (input.charCodeAt(pos.offset) === 34) {
+                result2 = "\"";
+                advance(pos, 1);
+              } else {
+                result2 = null;
+                if (reportFailures === 0) {
+                  matchFailed("\"\\\"\"");
+                }
+              }
+              if (result2 !== null) {
+                result0 = [result0, result1, result2];
+              } else {
+                result0 = null;
+                pos = clone(pos1);
+              }
+            } else {
+              result0 = null;
+              pos = clone(pos1);
+            }
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+          if (result0 !== null) {
+            result0 = (function(offset, line, column, l) { return ["literal", l].concat([['line', line], ['col', column]]) })(pos0.offset, pos0.line, pos0.column, result0[1]);
+          }
+          if (result0 === null) {
+            pos = clone(pos0);
+          }
+          if (result0 === null) {
+            pos0 = clone(pos);
+            pos1 = clone(pos);
+            if (input.charCodeAt(pos.offset) === 34) {
+              result0 = "\"";
+              advance(pos, 1);
+            } else {
+              result0 = null;
+              if (reportFailures === 0) {
+                matchFailed("\"\\\"\"");
+              }
+            }
+            if (result0 !== null) {
+              result2 = parse_inline_part();
+              if (result2 !== null) {
+                result1 = [];
+                while (result2 !== null) {
+                  result1.push(result2);
+                  result2 = parse_inline_part();
+                }
+              } else {
+                result1 = null;
+              }
+              if (result1 !== null) {
+                if (input.charCodeAt(pos.offset) === 34) {
+                  result2 = "\"";
+                  advance(pos, 1);
+                } else {
+                  result2 = null;
+                  if (reportFailures === 0) {
+                    matchFailed("\"\\\"\"");
+                  }
+                }
+                if (result2 !== null) {
+                  result0 = [result0, result1, result2];
+                } else {
+                  result0 = null;
+                  pos = clone(pos1);
+                }
+              } else {
+                result0 = null;
+                pos = clone(pos1);
+              }
+            } else {
+              result0 = null;
+              pos = clone(pos1);
+            }
+            if (result0 !== null) {
+              result0 = (function(offset, line, column, p) { return ["body"].concat(p).concat([['line', line], ['col', column]]) })(pos0.offset, pos0.line, pos0.column, result0[1]);
+            }
+            if (result0 === null) {
+              pos = clone(pos0);
+            }
+          }
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("inline");
+        }
+        return result0;
+      }
+      
+      function parse_inline_part() {
+        var result0;
+        var pos0;
+        
+        result0 = parse_special();
+        if (result0 === null) {
+          result0 = parse_reference();
+          if (result0 === null) {
+            pos0 = clone(pos);
+            result0 = parse_literal();
+            if (result0 !== null) {
+              result0 = (function(offset, line, column, l) { return ["buffer", l] })(pos0.offset, pos0.line, pos0.column, result0);
+            }
+            if (result0 === null) {
+              pos = clone(pos0);
+            }
+          }
+        }
+        return result0;
+      }
+      
+      function parse_buffer() {
+        var result0, result1, result2, result3, result4;
+        var pos0, pos1, pos2, pos3;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        result0 = parse_eol();
+        if (result0 !== null) {
+          result1 = [];
+          result2 = parse_ws();
+          while (result2 !== null) {
+            result1.push(result2);
+            result2 = parse_ws();
+          }
+          if (result1 !== null) {
+            result0 = [result0, result1];
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos1);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, e, w) { return ["format", e, w.join('')].concat([['line', line], ['col', column]]) })(pos0.offset, pos0.line, pos0.column, result0[0], result0[1]);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        if (result0 === null) {
+          pos0 = clone(pos);
+          pos1 = clone(pos);
+          pos2 = clone(pos);
+          pos3 = clone(pos);
+          reportFailures++;
+          result1 = parse_tag();
+          reportFailures--;
+          if (result1 === null) {
+            result1 = "";
+          } else {
+            result1 = null;
+            pos = clone(pos3);
+          }
+          if (result1 !== null) {
+            pos3 = clone(pos);
+            reportFailures++;
+            result2 = parse_comment();
+            reportFailures--;
+            if (result2 === null) {
+              result2 = "";
+            } else {
+              result2 = null;
+              pos = clone(pos3);
+            }
+            if (result2 !== null) {
+              pos3 = clone(pos);
+              reportFailures++;
+              result3 = parse_eol();
+              reportFailures--;
+              if (result3 === null) {
+                result3 = "";
+              } else {
+                result3 = null;
+                pos = clone(pos3);
+              }
+              if (result3 !== null) {
+                if (input.length > pos.offset) {
+                  result4 = input.charAt(pos.offset);
+                  advance(pos, 1);
+                } else {
+                  result4 = null;
+                  if (reportFailures === 0) {
+                    matchFailed("any character");
+                  }
+                }
+                if (result4 !== null) {
+                  result1 = [result1, result2, result3, result4];
+                } else {
+                  result1 = null;
+                  pos = clone(pos2);
+                }
+              } else {
+                result1 = null;
+                pos = clone(pos2);
+              }
+            } else {
+              result1 = null;
+              pos = clone(pos2);
+            }
+          } else {
+            result1 = null;
+            pos = clone(pos2);
+          }
+          if (result1 !== null) {
+            result1 = (function(offset, line, column, c) {return c})(pos1.offset, pos1.line, pos1.column, result1[3]);
+          }
+          if (result1 === null) {
+            pos = clone(pos1);
+          }
+          if (result1 !== null) {
+            result0 = [];
+            while (result1 !== null) {
+              result0.push(result1);
+              pos1 = clone(pos);
+              pos2 = clone(pos);
+              pos3 = clone(pos);
+              reportFailures++;
+              result1 = parse_tag();
+              reportFailures--;
+              if (result1 === null) {
+                result1 = "";
+              } else {
+                result1 = null;
+                pos = clone(pos3);
+              }
+              if (result1 !== null) {
+                pos3 = clone(pos);
+                reportFailures++;
+                result2 = parse_comment();
+                reportFailures--;
+                if (result2 === null) {
+                  result2 = "";
+                } else {
+                  result2 = null;
+                  pos = clone(pos3);
+                }
+                if (result2 !== null) {
+                  pos3 = clone(pos);
+                  reportFailures++;
+                  result3 = parse_eol();
+                  reportFailures--;
+                  if (result3 === null) {
+                    result3 = "";
+                  } else {
+                    result3 = null;
+                    pos = clone(pos3);
+                  }
+                  if (result3 !== null) {
+                    if (input.length > pos.offset) {
+                      result4 = input.charAt(pos.offset);
+                      advance(pos, 1);
+                    } else {
+                      result4 = null;
+                      if (reportFailures === 0) {
+                        matchFailed("any character");
+                      }
+                    }
+                    if (result4 !== null) {
+                      result1 = [result1, result2, result3, result4];
+                    } else {
+                      result1 = null;
+                      pos = clone(pos2);
+                    }
+                  } else {
+                    result1 = null;
+                    pos = clone(pos2);
+                  }
+                } else {
+                  result1 = null;
+                  pos = clone(pos2);
+                }
+              } else {
+                result1 = null;
+                pos = clone(pos2);
+              }
+              if (result1 !== null) {
+                result1 = (function(offset, line, column, c) {return c})(pos1.offset, pos1.line, pos1.column, result1[3]);
+              }
+              if (result1 === null) {
+                pos = clone(pos1);
+              }
+            }
+          } else {
+            result0 = null;
+          }
+          if (result0 !== null) {
+            result0 = (function(offset, line, column, b) { return ["buffer", b.join('')].concat([['line', line], ['col', column]]) })(pos0.offset, pos0.line, pos0.column, result0);
+          }
+          if (result0 === null) {
+            pos = clone(pos0);
+          }
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("buffer");
+        }
+        return result0;
+      }
+      
+      function parse_literal() {
+        var result0, result1, result2;
+        var pos0, pos1, pos2, pos3;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        pos2 = clone(pos);
+        pos3 = clone(pos);
+        reportFailures++;
+        result1 = parse_tag();
+        reportFailures--;
+        if (result1 === null) {
+          result1 = "";
+        } else {
+          result1 = null;
+          pos = clone(pos3);
+        }
+        if (result1 !== null) {
+          result2 = parse_esc();
+          if (result2 === null) {
+            if (/^[^"]/.test(input.charAt(pos.offset))) {
+              result2 = input.charAt(pos.offset);
+              advance(pos, 1);
+            } else {
+              result2 = null;
+              if (reportFailures === 0) {
+                matchFailed("[^\"]");
+              }
+            }
+          }
+          if (result2 !== null) {
+            result1 = [result1, result2];
+          } else {
+            result1 = null;
+            pos = clone(pos2);
+          }
+        } else {
+          result1 = null;
+          pos = clone(pos2);
+        }
+        if (result1 !== null) {
+          result1 = (function(offset, line, column, c) {return c})(pos1.offset, pos1.line, pos1.column, result1[1]);
+        }
+        if (result1 === null) {
+          pos = clone(pos1);
+        }
+        if (result1 !== null) {
+          result0 = [];
+          while (result1 !== null) {
+            result0.push(result1);
+            pos1 = clone(pos);
+            pos2 = clone(pos);
+            pos3 = clone(pos);
+            reportFailures++;
+            result1 = parse_tag();
+            reportFailures--;
+            if (result1 === null) {
+              result1 = "";
+            } else {
+              result1 = null;
+              pos = clone(pos3);
+            }
+            if (result1 !== null) {
+              result2 = parse_esc();
+              if (result2 === null) {
+                if (/^[^"]/.test(input.charAt(pos.offset))) {
+                  result2 = input.charAt(pos.offset);
+                  advance(pos, 1);
+                } else {
+                  result2 = null;
+                  if (reportFailures === 0) {
+                    matchFailed("[^\"]");
+                  }
+                }
+              }
+              if (result2 !== null) {
+                result1 = [result1, result2];
+              } else {
+                result1 = null;
+                pos = clone(pos2);
+              }
+            } else {
+              result1 = null;
+              pos = clone(pos2);
+            }
+            if (result1 !== null) {
+              result1 = (function(offset, line, column, c) {return c})(pos1.offset, pos1.line, pos1.column, result1[1]);
+            }
+            if (result1 === null) {
+              pos = clone(pos1);
+            }
+          }
+        } else {
+          result0 = null;
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, b) { return b.join('') })(pos0.offset, pos0.line, pos0.column, result0);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("literal");
+        }
+        return result0;
+      }
+      
+      function parse_esc() {
+        var result0;
+        var pos0;
+        
+        pos0 = clone(pos);
+        if (input.substr(pos.offset, 2) === "\\\"") {
+          result0 = "\\\"";
+          advance(pos, 2);
+        } else {
+          result0 = null;
+          if (reportFailures === 0) {
+            matchFailed("\"\\\\\\\"\"");
+          }
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column) { return '"' })(pos0.offset, pos0.line, pos0.column);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        return result0;
+      }
+      
+      function parse_comment() {
+        var result0, result1, result2, result3;
+        var pos0, pos1, pos2, pos3, pos4;
+        
+        reportFailures++;
+        pos0 = clone(pos);
+        pos1 = clone(pos);
+        if (input.substr(pos.offset, 2) === "{!") {
+          result0 = "{!";
+          advance(pos, 2);
+        } else {
+          result0 = null;
+          if (reportFailures === 0) {
+            matchFailed("\"{!\"");
+          }
+        }
+        if (result0 !== null) {
+          result1 = [];
+          pos2 = clone(pos);
+          pos3 = clone(pos);
+          pos4 = clone(pos);
+          reportFailures++;
+          if (input.substr(pos.offset, 2) === "!}") {
+            result2 = "!}";
+            advance(pos, 2);
+          } else {
+            result2 = null;
+            if (reportFailures === 0) {
+              matchFailed("\"!}\"");
+            }
+          }
+          reportFailures--;
+          if (result2 === null) {
+            result2 = "";
+          } else {
+            result2 = null;
+            pos = clone(pos4);
+          }
+          if (result2 !== null) {
+            if (input.length > pos.offset) {
+              result3 = input.charAt(pos.offset);
+              advance(pos, 1);
+            } else {
+              result3 = null;
+              if (reportFailures === 0) {
+                matchFailed("any character");
+              }
+            }
+            if (result3 !== null) {
+              result2 = [result2, result3];
+            } else {
+              result2 = null;
+              pos = clone(pos3);
+            }
+          } else {
+            result2 = null;
+            pos = clone(pos3);
+          }
+          if (result2 !== null) {
+            result2 = (function(offset, line, column, c) {return c})(pos2.offset, pos2.line, pos2.column, result2[1]);
+          }
+          if (result2 === null) {
+            pos = clone(pos2);
+          }
+          while (result2 !== null) {
+            result1.push(result2);
+            pos2 = clone(pos);
+            pos3 = clone(pos);
+            pos4 = clone(pos);
+            reportFailures++;
+            if (input.substr(pos.offset, 2) === "!}") {
+              result2 = "!}";
+              advance(pos, 2);
+            } else {
+              result2 = null;
+              if (reportFailures === 0) {
+                matchFailed("\"!}\"");
+              }
+            }
+            reportFailures--;
+            if (result2 === null) {
+              result2 = "";
+            } else {
+              result2 = null;
+              pos = clone(pos4);
+            }
+            if (result2 !== null) {
+              if (input.length > pos.offset) {
+                result3 = input.charAt(pos.offset);
+                advance(pos, 1);
+              } else {
+                result3 = null;
+                if (reportFailures === 0) {
+                  matchFailed("any character");
+                }
+              }
+              if (result3 !== null) {
+                result2 = [result2, result3];
+              } else {
+                result2 = null;
+                pos = clone(pos3);
+              }
+            } else {
+              result2 = null;
+              pos = clone(pos3);
+            }
+            if (result2 !== null) {
+              result2 = (function(offset, line, column, c) {return c})(pos2.offset, pos2.line, pos2.column, result2[1]);
+            }
+            if (result2 === null) {
+              pos = clone(pos2);
+            }
+          }
+          if (result1 !== null) {
+            if (input.substr(pos.offset, 2) === "!}") {
+              result2 = "!}";
+              advance(pos, 2);
+            } else {
+              result2 = null;
+              if (reportFailures === 0) {
+                matchFailed("\"!}\"");
+              }
+            }
+            if (result2 !== null) {
+              result0 = [result0, result1, result2];
+            } else {
+              result0 = null;
+              pos = clone(pos1);
+            }
+          } else {
+            result0 = null;
+            pos = clone(pos1);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos1);
+        }
+        if (result0 !== null) {
+          result0 = (function(offset, line, column, c) { return ["comment", c.join('')].concat([['line', line], ['col', column]]) })(pos0.offset, pos0.line, pos0.column, result0[1]);
+        }
+        if (result0 === null) {
+          pos = clone(pos0);
+        }
+        reportFailures--;
+        if (reportFailures === 0 && result0 === null) {
+          matchFailed("comment");
+        }
+        return result0;
+      }
+      
+      function parse_tag() {
+        var result0, result1, result2, result3, result4, result5, result6, result7;
+        var pos0, pos1, pos2;
+        
+        pos0 = clone(pos);
+        result0 = parse_ld();
+        if (result0 !== null) {
+          result1 = [];
+          result2 = parse_ws();
+          while (result2 !== null) {
+            result1.push(result2);
+            result2 = parse_ws();
+          }
+          if (result1 !== null) {
+            if (/^[#?^><+%:@\/~%]/.test(input.charAt(pos.offset))) {
+              result2 = input.charAt(pos.offset);
+              advance(pos, 1);
+            } else {
+              result2 = null;
+              if (reportFailures === 0) {
+                matchFailed("[#?^><+%:@\\/~%]");
+              }
+            }
+            if (result2 !== null) {
+              result3 = [];
+              result4 = parse_ws();
+              while (result4 !== null) {
+                result3.push(result4);
+                result4 = parse_ws();
+              }
+              if (result3 !== null) {
+                pos1 = clone(pos);
+                pos2 = clone(pos);
+                reportFailures++;
+                result5 = parse_rd();
+                reportFailures--;
+                if (result5 === null) {
+                  result5 = "";
+                } else {
+                  result5 = null;
+                  pos = clone(pos2);
+                }
+                if (result5 !== null) {
+                  pos2 = clone(pos);
+                  reportFailures++;
+                  result6 = parse_eol();
+                  reportFailures--;
+                  if (result6 === null) {
+                    result6 = "";
+                  } else {
+                    result6 = null;
+                    pos = clone(pos2);
+                  }
+                  if (result6 !== null) {
+                    if (input.length > pos.offset) {
+                      result7 = input.charAt(pos.offset);
+                      advance(pos, 1);
+                    } else {
+                      result7 = null;
+                      if (reportFailures === 0) {
+                        matchFailed("any character");
+                      }
+                    }
+                    if (result7 !== null) {
+                      result5 = [result5, result6, result7];
+                    } else {
+                      result5 = null;
+                      pos = clone(pos1);
+                    }
+                  } else {
+                    result5 = null;
+                    pos = clone(pos1);
+                  }
+                } else {
+                  result5 = null;
+                  pos = clone(pos1);
+                }
+                if (result5 !== null) {
+                  result4 = [];
+                  while (result5 !== null) {
+                    result4.push(result5);
+                    pos1 = clone(pos);
+                    pos2 = clone(pos);
+                    reportFailures++;
+                    result5 = parse_rd();
+                    reportFailures--;
+                    if (result5 === null) {
+                      result5 = "";
+                    } else {
+                      result5 = null;
+                      pos = clone(pos2);
+                    }
+                    if (result5 !== null) {
+                      pos2 = clone(pos);
+                      reportFailures++;
+                      result6 = parse_eol();
+                      reportFailures--;
+                      if (result6 === null) {
+                        result6 = "";
+                      } else {
+                        result6 = null;
+                        pos = clone(pos2);
+                      }
+                      if (result6 !== null) {
+                        if (input.length > pos.offset) {
+                          result7 = input.charAt(pos.offset);
+                          advance(pos, 1);
+                        } else {
+                          result7 = null;
+                          if (reportFailures === 0) {
+                            matchFailed("any character");
+                          }
+                        }
+                        if (result7 !== null) {
+                          result5 = [result5, result6, result7];
+                        } else {
+                          result5 = null;
+                          pos = clone(pos1);
+                        }
+                      } else {
+                        result5 = null;
+                        pos = clone(pos1);
+                      }
+                    } else {
+                      result5 = null;
+                      pos = clone(pos1);
+                    }
+                  }
+                } else {
+                  result4 = null;
+                }
+                if (result4 !== null) {
+                  result5 = [];
+                  result6 = parse_ws();
+                  while (result6 !== null) {
+                    result5.push(result6);
+                    result6 = parse_ws();
+                  }
+                  if (result5 !== null) {
+                    result6 = parse_rd();
+                    if (result6 !== null) {
+                      result0 = [result0, result1, result2, result3, result4, result5, result6];
+                    } else {
+                      result0 = null;
+                      pos = clone(pos0);
+                    }
+                  } else {
+                    result0 = null;
+                    pos = clone(pos0);
+                  }
+                } else {
+                  result0 = null;
+                  pos = clone(pos0);
+                }
+              } else {
+                result0 = null;
+                pos = clone(pos0);
+              }
+            } else {
+              result0 = null;
+              pos = clone(pos0);
+            }
+          } else {
+            result0 = null;
+            pos = clone(pos0);
+          }
+        } else {
+          result0 = null;
+          pos = clone(pos0);
+        }
+        if (result0 === null) {
+          result0 = parse_reference();
+        }
+        return result0;
+      }
+      
+      function parse_ld() {
+        var result0;
+        
+        if (input.charCodeAt(pos.offset) === 123) {
+          result0 = "{";
+          advance(pos, 1);
+        } else {
+          result0 = null;
+          if (reportFailures === 0) {
+            matchFailed("\"{\"");
+          }
+        }
+        return result0;
+      }
+      
+      function parse_rd() {
+        var result0;
+        
+        if (input.charCodeAt(pos.offset) === 125) {
+          result0 = "}";
+          advance(pos, 1);
+        } else {
+          result0 = null;
+          if (reportFailures === 0) {
+            matchFailed("\"}\"");
+          }
+        }
+        return result0;
+      }
+      
+      function parse_lb() {
+        var result0;
+        
+        if (input.charCodeAt(pos.offset) === 91) {
+          result0 = "[";
+          advance(pos, 1);
+        } else {
+          result0 = null;
+          if (reportFailures === 0) {
+            matchFailed("\"[\"");
+          }
+        }
+        return result0;
+      }
+      
+      function parse_rb() {
+        var result0;
+        
+        if (input.charCodeAt(pos.offset) === 93) {
+          result0 = "]";
+          advance(pos, 1);
+        } else {
+          result0 = null;
+          if (reportFailures === 0) {
+            matchFailed("\"]\"");
+          }
+        }
+        return result0;
+      }
+      
+      function parse_eol() {
+        var result0;
+        
+        if (input.charCodeAt(pos.offset) === 10) {
+          result0 = "\n";
+          advance(pos, 1);
+        } else {
+          result0 = null;
+          if (reportFailures === 0) {
+            matchFailed("\"\\n\"");
+          }
+        }
+        if (result0 === null) {
+          if (input.substr(pos.offset, 2) === "\r\n") {
+            result0 = "\r\n";
+            advance(pos, 2);
+          } else {
+            result0 = null;
+            if (reportFailures === 0) {
+              matchFailed("\"\\r\\n\"");
+            }
+          }
+          if (result0 === null) {
+            if (input.charCodeAt(pos.offset) === 13) {
+              result0 = "\r";
+              advance(pos, 1);
+            } else {
+              result0 = null;
+              if (reportFailures === 0) {
+                matchFailed("\"\\r\"");
+              }
+            }
+            if (result0 === null) {
+              if (input.charCodeAt(pos.offset) === 8232) {
+                result0 = "\u2028";
+                advance(pos, 1);
+              } else {
+                result0 = null;
+                if (reportFailures === 0) {
+                  matchFailed("\"\\u2028\"");
+                }
+              }
+              if (result0 === null) {
+                if (input.charCodeAt(pos.offset) === 8233) {
+                  result0 = "\u2029";
+                  advance(pos, 1);
+                } else {
+                  result0 = null;
+                  if (reportFailures === 0) {
+                    matchFailed("\"\\u2029\"");
+                  }
+                }
+              }
+            }
+          }
+        }
+        return result0;
+      }
+      
+      function parse_ws() {
+        var result0;
+        
+        if (/^[\t\x0B\f \xA0\uFEFF]/.test(input.charAt(pos.offset))) {
+          result0 = input.charAt(pos.offset);
+          advance(pos, 1);
+        } else {
+          result0 = null;
+          if (reportFailures === 0) {
+            matchFailed("[\\t\\x0B\\f \\xA0\\uFEFF]");
+          }
+        }
+        if (result0 === null) {
+          result0 = parse_eol();
+        }
+        return result0;
+      }
+      
+      
+      function cleanupExpected(expected) {
+        expected.sort();
+        
+        var lastExpected = null;
+        var cleanExpected = [];
+        for (var i = 0; i < expected.length; i++) {
+          if (expected[i] !== lastExpected) {
+            cleanExpected.push(expected[i]);
+            lastExpected = expected[i];
+          }
+        }
+        return cleanExpected;
+      }
+      
+      
+      
+      var result = parseFunctions[startRule]();
+      
+      /*
+       * The parser is now in one of the following three states:
+       *
+       * 1. The parser successfully parsed the whole input.
+       *
+       *    - |result !== null|
+       *    - |pos.offset === input.length|
+       *    - |rightmostFailuresExpected| may or may not contain something
+       *
+       * 2. The parser successfully parsed only a part of the input.
+       *
+       *    - |result !== null|
+       *    - |pos.offset < input.length|
+       *    - |rightmostFailuresExpected| may or may not contain something
+       *
+       * 3. The parser did not successfully parse any part of the input.
+       *
+       *   - |result === null|
+       *   - |pos.offset === 0|
+       *   - |rightmostFailuresExpected| contains at least one failure
+       *
+       * All code following this comment (including called functions) must
+       * handle these states.
+       */
+      if (result === null || pos.offset !== input.length) {
+        var offset = Math.max(pos.offset, rightmostFailuresPos.offset);
+        var found = offset < input.length ? input.charAt(offset) : null;
+        var errorPosition = pos.offset > rightmostFailuresPos.offset ? pos : rightmostFailuresPos;
+        
+        throw new parser.SyntaxError(
+          cleanupExpected(rightmostFailuresExpected),
+          found,
+          offset,
+          errorPosition.line,
+          errorPosition.column
+        );
+      }
+      
+      return result;
+    },
+    
+    /* Returns the parser source code. */
+    toSource: function() { return this._source; }
+  };
+  
+  /* Thrown when a parser encounters a syntax error. */
+  
+  result.SyntaxError = function(expected, found, offset, line, column) {
+    function buildMessage(expected, found) {
+      var expectedHumanized, foundHumanized;
+      
+      switch (expected.length) {
+        case 0:
+          expectedHumanized = "end of input";
+          break;
+        case 1:
+          expectedHumanized = expected[0];
+          break;
+        default:
+          expectedHumanized = expected.slice(0, expected.length - 1).join(", ")
+            + " or "
+            + expected[expected.length - 1];
+      }
+      
+      foundHumanized = found ? quote(found) : "end of input";
+      
+      return "Expected " + expectedHumanized + " but " + foundHumanized + " found.";
+    }
+    
+    this.name = "SyntaxError";
+    this.expected = expected;
+    this.found = found;
+    this.message = buildMessage(expected, found);
+    this.offset = offset;
+    this.line = line;
+    this.column = column;
+  };
+  
+  result.SyntaxError.prototype = Error.prototype;
+  
+  return result;
+})();
+
+dust.parse = parser.parse;
+
+})(typeof exports !== 'undefined' ? exports : getGlobal());
\ No newline at end of file
diff --git a/lib/parser.js b/lib/parser.js
index d3ca968d..9d6b1357 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -256,7 +256,7 @@ var parser = (function(){
           pos = clone(pos1);
         }
         if (result0 !== null) {
-          result0 = (function(offset, line, column, t, b, e, n) { e.push(["param", ["literal", "block"], b]); t.push(e); return t })(pos0.offset, pos0.line, pos0.column, result0[0], result0[3], result0[4], result0[5]);
+          result0 = (function(offset, line, column, t, b, e, n) { e.push(["param", ["literal", "block"], b]); t.push(e); return t.concat([['line', line], ['col', column]]) })(pos0.offset, pos0.line, pos0.column, result0[0], result0[3], result0[4], result0[5]);
         }
         if (result0 === null) {
           pos = clone(pos0);
@@ -1725,7 +1725,7 @@ var parser = (function(){
             pos0 = clone(pos);
             result0 = parse_literal();
             if (result0 !== null) {
-              result0 = (function(offset, line, column, l) { return ["buffer", l].concat([['line', line], ['col', column]]) })(pos0.offset, pos0.line, pos0.column, result0);
+              result0 = (function(offset, line, column, l) { return ["buffer", l] })(pos0.offset, pos0.line, pos0.column, result0);
             }
             if (result0 === null) {
               pos = clone(pos0);
@@ -1761,7 +1761,7 @@ var parser = (function(){
           pos = clone(pos1);
         }
         if (result0 !== null) {
-          result0 = (function(offset, line, column, e, w) { return ["format", e, w.join('')] })(pos0.offset, pos0.line, pos0.column, result0[0], result0[1]);
+          result0 = (function(offset, line, column, e, w) { return ["format", e, w.join('')].concat([['line', line], ['col', column]]) })(pos0.offset, pos0.line, pos0.column, result0[0], result0[1]);
         }
         if (result0 === null) {
           pos = clone(pos0);
diff --git a/package.json b/package.json
index a54a2af3..2e8ecda2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dustjs-linkedin",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "author": "Aleksander Williams",
   "description": "Asynchronous templates for the browser and node.js ( LinkedIn fork )",
   "contributors": [