diff --git a/src/Mustache/Engine.php b/src/Mustache/Engine.php
index 856d4ef..844335c 100644
--- a/src/Mustache/Engine.php
+++ b/src/Mustache/Engine.php
@@ -54,6 +54,7 @@ class Mustache_Engine
     private $logger;
     private $strictCallables = false;
     private $pragmas = array();
+    private $delimiters = '{{ }}';
 
     // Services
     private $tokenizer;
@@ -191,6 +192,10 @@ class Mustache_Engine
             $this->strictCallables = $options['strict_callables'];
         }
 
+        if (isset($options['delimiters'])) {
+            $this->delimiters = $options['delimiters'];
+        }
+
         if (isset($options['pragmas'])) {
             foreach ($options['pragmas'] as $pragma) {
                 if (!isset(self::$knownPragmas[$pragma])) {
@@ -725,7 +730,7 @@ class Mustache_Engine
      */
     private function tokenize($source)
     {
-        return $this->getTokenizer()->scan($source);
+        return $this->getTokenizer()->scan($source, $this->delimiters);
     }
 
     /**