diff --git a/.travis.yml b/.travis.yml
index 7d3b7e5..e68b99c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,5 @@
 language: php
 
-install:
-  - curl http://get.sensiolabs.org/php-cs-fixer.phar -o php-cs-fixer.phar
-
-script:
-  - phpunit
-  - if [[ `php -r "echo version_compare(PHP_VERSION, '5.3.6', '>=') && !defined('HHVM_VERSION');"` ]]; then php php-cs-fixer.phar --diff --dry-run -vv fix; fi
-
 php:
   - 5.2
   - 5.3
@@ -16,4 +9,7 @@ php:
   - 7.0
   - hhvm
 
+script:
+  - phpunit
+
 sudo: false
diff --git a/README.md b/README.md
index 6a309ae..a596ace 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ A [Mustache](http://mustache.github.com/) implementation in PHP.
 
 [![Package version](http://img.shields.io/packagist/v/mustache/mustache.svg?style=flat-square)](https://packagist.org/packages/mustache/mustache)
 [![Build status](http://img.shields.io/travis/bobthecow/mustache.php/dev.svg?style=flat-square)](http://travis-ci.org/bobthecow/mustache.php)
+[![StyleCI](https://styleci.io/repos/569670/shield)](https://styleci.io/repos/569670)
 [![Monthly downloads](http://img.shields.io/packagist/dm/mustache/mustache.svg?style=flat-square)](https://packagist.org/packages/mustache/mustache)
 
 
diff --git a/bin/build_bootstrap.php b/bin/build_bootstrap.php
index 8a63803..cc23b2b 100755
--- a/bin/build_bootstrap.php
+++ b/bin/build_bootstrap.php
@@ -78,7 +78,7 @@ class SymfonyClassCollectionLoader
 {
     private static $loaded;
 
-    const HEADER = <<<EOS
+    const HEADER = <<<'EOS'
 <?php
 
 /*
diff --git a/composer.json b/composer.json
index f2ba0f9..d0514f3 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "~3.7|~4.0|~5.0",
-        "fabpot/php-cs-fixer": "~1.6"
+        "friendsofphp/php-cs-fixer": "~1.11"
     },
     "autoload": {
         "psr-0": { "Mustache": "src/" }
diff --git a/src/Mustache/Autoloader.php b/src/Mustache/Autoloader.php
index b33bc24..b16ac14 100644
--- a/src/Mustache/Autoloader.php
+++ b/src/Mustache/Autoloader.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Mustache/Cache.php b/src/Mustache/Cache.php
index 5df8a23..7b465ab 100644
--- a/src/Mustache/Cache.php
+++ b/src/Mustache/Cache.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Mustache/Cache/AbstractCache.php b/src/Mustache/Cache/AbstractCache.php
index cf1c041..495090b 100644
--- a/src/Mustache/Cache/AbstractCache.php
+++ b/src/Mustache/Cache/AbstractCache.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Mustache/Cache/FilesystemCache.php b/src/Mustache/Cache/FilesystemCache.php
index 5b56222..0dbe8f9 100644
--- a/src/Mustache/Cache/FilesystemCache.php
+++ b/src/Mustache/Cache/FilesystemCache.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -27,8 +27,8 @@ class Mustache_Cache_FilesystemCache extends Mustache_Cache_AbstractCache
     /**
      * Filesystem cache constructor.
      *
-     * @param string $baseDir  Directory for compiled templates.
-     * @param int    $fileMode Override default permissions for cache files. Defaults to using the system-defined umask.
+     * @param string $baseDir  Directory for compiled templates
+     * @param int    $fileMode Override default permissions for cache files. Defaults to using the system-defined umask
      */
     public function __construct($baseDir, $fileMode = null)
     {
diff --git a/src/Mustache/Cache/NoopCache.php b/src/Mustache/Cache/NoopCache.php
index 7a4b55b..ca0007d 100644
--- a/src/Mustache/Cache/NoopCache.php
+++ b/src/Mustache/Cache/NoopCache.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Mustache/Compiler.php b/src/Mustache/Compiler.php
index 76e580c..2a831d6 100644
--- a/src/Mustache/Compiler.php
+++ b/src/Mustache/Compiler.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -75,7 +75,7 @@ class Mustache_Compiler
     /**
      * Helper function for walking the Mustache token parse tree.
      *
-     * @throws Mustache_Exception_SyntaxException upon encountering unknown token types.
+     * @throws Mustache_Exception_SyntaxException upon encountering unknown token types
      *
      * @param array $tree  Parse tree of Mustache tokens
      * @param int   $level (default: 0)
@@ -191,7 +191,7 @@ class Mustache_Compiler
             {
                 $this->lambdaHelper = new Mustache_LambdaHelper($this->mustache, $context);
                 $buffer = \'\';
-                $newContext = array();
+                $blocksContext = array();
         %s
 
                 return $buffer;
@@ -207,7 +207,7 @@ class Mustache_Compiler
             public function renderInternal(Mustache_Context $context, $indent = \'\')
             {
                 $buffer = \'\';
-                $newContext = array();
+                $blocksContext = array();
         %s
 
                 return $buffer;
@@ -264,7 +264,7 @@ class Mustache_Compiler
         return sprintf($this->prepare(self::BLOCK_VAR, $level), $id, $this->walk($nodes, $level));
     }
 
-    const BLOCK_ARG = '$newContext[%s] = array($this, \'block%s\');';
+    const BLOCK_ARG = '$blocksContext[%s] = array($this, \'block%s\');';
 
     /**
      * Generate Mustache Template inheritance block argument PHP source.
@@ -291,7 +291,8 @@ class Mustache_Compiler
     const BLOCK_FUNCTION = '
         public function block%s($context)
         {
-            $indent = $buffer = \'\';%s
+            $indent = $buffer = \'\';
+            $blocksContext = array();%s
 
             return $buffer;
         }
@@ -326,6 +327,8 @@ class Mustache_Compiler
         private function section%s(Mustache_Context $context, $indent, $value)
         {
             $buffer = \'\';
+            $blocksContext = array();
+
             if (%s) {
                 $source = %s;
                 $result = call_user_func($value, $source, %s);
@@ -456,8 +459,8 @@ class Mustache_Compiler
     const PARENT = '
         %s
 
-        if ($parent = $this->mustache->LoadPartial(%s)) {
-            $context->pushBlockContext($newContext);
+        if ($parent = $this->mustache->loadPartial(%s)) {
+            $context->pushBlockContext($blocksContext);
             $buffer .= $parent->renderInternal($context, $indent);
             $context->popBlockContext();
         }
@@ -490,7 +493,7 @@ class Mustache_Compiler
      *
      * @param array $node
      *
-     * @return bool True if $node is a block arg token.
+     * @return bool True if $node is a block arg token
      */
     private static function onlyBlockArgs(array $node)
     {
diff --git a/src/Mustache/Context.php b/src/Mustache/Context.php
index e660b54..f59faea 100644
--- a/src/Mustache/Context.php
+++ b/src/Mustache/Context.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -150,7 +150,7 @@ class Mustache_Context
      *
      * @see Mustache_Context::findDot
      *
-     * @throws Mustache_Exception_InvalidArgumentException if given an invalid anchored dot $id.
+     * @throws Mustache_Exception_InvalidArgumentException if given an invalid anchored dot $id
      *
      * @param string $id Dotted variable selector
      *
@@ -182,7 +182,7 @@ class Mustache_Context
      *
      * @param string $id
      *
-     * @return mixed Variable value, or '' if not found.
+     * @return mixed Variable value, or '' if not found
      */
     public function findInBlock($id)
     {
diff --git a/src/Mustache/Engine.php b/src/Mustache/Engine.php
index fe11912..3aeb923 100644
--- a/src/Mustache/Engine.php
+++ b/src/Mustache/Engine.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -23,7 +23,7 @@
  */
 class Mustache_Engine
 {
-    const VERSION        = '2.10.0';
+    const VERSION        = '2.11.0';
     const SPEC_VERSION   = '1.1.2';
 
     const PRAGMA_FILTERS      = 'FILTERS';
@@ -126,7 +126,7 @@ class Mustache_Engine
      *         'pragmas' => [Mustache_Engine::PRAGMA_FILTERS],
      *     );
      *
-     * @throws Mustache_Exception_InvalidArgumentException If `escape` option is not callable.
+     * @throws Mustache_Exception_InvalidArgumentException If `escape` option is not callable
      *
      * @param array $options (default: array())
      */
@@ -429,7 +429,7 @@ class Mustache_Engine
     /**
      * Set the Mustache Logger instance.
      *
-     * @throws Mustache_Exception_InvalidArgumentException If logger is not an instance of Mustache_Logger or Psr\Log\LoggerInterface.
+     * @throws Mustache_Exception_InvalidArgumentException If logger is not an instance of Mustache_Logger or Psr\Log\LoggerInterface
      *
      * @param Mustache_Logger|Psr\Log\LoggerInterface $logger
      */
diff --git a/src/Mustache/Exception.php b/src/Mustache/Exception.php
index 7c04792..66bd6bd 100644
--- a/src/Mustache/Exception.php
+++ b/src/Mustache/Exception.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Mustache/Exception/InvalidArgumentException.php b/src/Mustache/Exception/InvalidArgumentException.php
index c6084b8..46b200c 100644
--- a/src/Mustache/Exception/InvalidArgumentException.php
+++ b/src/Mustache/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Mustache/Exception/LogicException.php b/src/Mustache/Exception/LogicException.php
index 4bfda5f..8e75e7e 100644
--- a/src/Mustache/Exception/LogicException.php
+++ b/src/Mustache/Exception/LogicException.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Mustache/Exception/RuntimeException.php b/src/Mustache/Exception/RuntimeException.php
index 5eb90dd..9a7b90b 100644
--- a/src/Mustache/Exception/RuntimeException.php
+++ b/src/Mustache/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Mustache/Exception/SyntaxException.php b/src/Mustache/Exception/SyntaxException.php
index ab4d6aa..4fcb39d 100644
--- a/src/Mustache/Exception/SyntaxException.php
+++ b/src/Mustache/Exception/SyntaxException.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,13 +17,18 @@ class Mustache_Exception_SyntaxException extends LogicException implements Musta
     protected $token;
 
     /**
-     * @param string $msg
-     * @param array  $token
+     * @param string    $msg
+     * @param array     $token
+     * @param Exception $previous
      */
-    public function __construct($msg, array $token)
+    public function __construct($msg, array $token, Exception $previous = null)
     {
         $this->token = $token;
-        parent::__construct($msg);
+        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+            parent::__construct($msg, 0, $previous);
+        } else {
+            parent::__construct($msg);
+        }
     }
 
     /**
diff --git a/src/Mustache/Exception/UnknownFilterException.php b/src/Mustache/Exception/UnknownFilterException.php
index 43d2c06..44505e4 100644
--- a/src/Mustache/Exception/UnknownFilterException.php
+++ b/src/Mustache/Exception/UnknownFilterException.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,12 +17,18 @@ class Mustache_Exception_UnknownFilterException extends UnexpectedValueException
     protected $filterName;
 
     /**
-     * @param string $filterName
+     * @param string    $filterName
+     * @param Exception $previous
      */
-    public function __construct($filterName)
+    public function __construct($filterName, Exception $previous = null)
     {
         $this->filterName = $filterName;
-        parent::__construct(sprintf('Unknown filter: %s', $filterName));
+        $message = sprintf('Unknown filter: %s', $filterName);
+        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+            parent::__construct($message, 0, $previous);
+        } else {
+            parent::__construct($message);
+        }
     }
 
     public function getFilterName()
diff --git a/src/Mustache/Exception/UnknownHelperException.php b/src/Mustache/Exception/UnknownHelperException.php
index 7fe4a71..e1bc4d2 100644
--- a/src/Mustache/Exception/UnknownHelperException.php
+++ b/src/Mustache/Exception/UnknownHelperException.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,12 +17,18 @@ class Mustache_Exception_UnknownHelperException extends InvalidArgumentException
     protected $helperName;
 
     /**
-     * @param string $helperName
+     * @param string    $helperName
+     * @param Exception $previous
      */
-    public function __construct($helperName)
+    public function __construct($helperName, Exception $previous = null)
     {
         $this->helperName = $helperName;
-        parent::__construct(sprintf('Unknown helper: %s', $helperName));
+        $message = sprintf('Unknown helper: %s', $helperName);
+        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+            parent::__construct($message, 0, $previous);
+        } else {
+            parent::__construct($message);
+        }
     }
 
     public function getHelperName()
diff --git a/src/Mustache/Exception/UnknownTemplateException.php b/src/Mustache/Exception/UnknownTemplateException.php
index f1f69bf..0c37796 100644
--- a/src/Mustache/Exception/UnknownTemplateException.php
+++ b/src/Mustache/Exception/UnknownTemplateException.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,12 +17,18 @@ class Mustache_Exception_UnknownTemplateException extends InvalidArgumentExcepti
     protected $templateName;
 
     /**
-     * @param string $templateName
+     * @param string    $templateName
+     * @param Exception $previous
      */
-    public function __construct($templateName)
+    public function __construct($templateName, Exception $previous = null)
     {
         $this->templateName = $templateName;
-        parent::__construct(sprintf('Unknown template: %s', $templateName));
+        $message = sprintf('Unknown template: %s', $templateName);
+        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+            parent::__construct($message, 0, $previous);
+        } else {
+            parent::__construct($message);
+        }
     }
 
     public function getTemplateName()
diff --git a/src/Mustache/HelperCollection.php b/src/Mustache/HelperCollection.php
index 0a92428..86c56b7 100644
--- a/src/Mustache/HelperCollection.php
+++ b/src/Mustache/HelperCollection.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -81,7 +81,7 @@ class Mustache_HelperCollection
     /**
      * Get a helper by name.
      *
-     * @throws Mustache_Exception_UnknownHelperException If helper does not exist.
+     * @throws Mustache_Exception_UnknownHelperException If helper does not exist
      *
      * @param string $name
      *
@@ -137,7 +137,7 @@ class Mustache_HelperCollection
     /**
      * Check whether a given helper is present in the collection.
      *
-     * @throws Mustache_Exception_UnknownHelperException if the requested helper is not present.
+     * @throws Mustache_Exception_UnknownHelperException if the requested helper is not present
      *
      * @param string $name
      */
diff --git a/src/Mustache/LambdaHelper.php b/src/Mustache/LambdaHelper.php
index cb8e966..1d203d5 100644
--- a/src/Mustache/LambdaHelper.php
+++ b/src/Mustache/LambdaHelper.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -25,8 +25,8 @@ class Mustache_LambdaHelper
     /**
      * Mustache Lambda Helper constructor.
      *
-     * @param Mustache_Engine  $mustache Mustache engine instance.
-     * @param Mustache_Context $context  Rendering context.
+     * @param Mustache_Engine  $mustache Mustache engine instance
+     * @param Mustache_Context $context  Rendering context
      * @param string           $delims   Optional custom delimiters, in the format `{{= <% %> =}}`. (default: null)
      */
     public function __construct(Mustache_Engine $mustache, Mustache_Context $context, $delims = null)
@@ -41,7 +41,7 @@ class Mustache_LambdaHelper
      *
      * @param string $string
      *
-     * @return string Rendered template.
+     * @return string Rendered template
      */
     public function render($string)
     {
@@ -65,7 +65,7 @@ class Mustache_LambdaHelper
     /**
      * Get a Lambda Helper with custom delimiters.
      *
-     * @param string $delims Custom delimiters, in the format `{{= <% %> =}}`.
+     * @param string $delims Custom delimiters, in the format `{{= <% %> =}}`
      *
      * @return Mustache_LambdaHelper
      */
diff --git a/src/Mustache/Loader.php b/src/Mustache/Loader.php
index 1b075d0..c5e1a19 100644
--- a/src/Mustache/Loader.php
+++ b/src/Mustache/Loader.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +17,7 @@ interface Mustache_Loader
     /**
      * Load a Template by name.
      *
-     * @throws Mustache_Exception_UnknownTemplateException If a template file is not found.
+     * @throws Mustache_Exception_UnknownTemplateException If a template file is not found
      *
      * @param string $name
      *
diff --git a/src/Mustache/Loader/ArrayLoader.php b/src/Mustache/Loader/ArrayLoader.php
index 90cecca..c0d6a4d 100644
--- a/src/Mustache/Loader/ArrayLoader.php
+++ b/src/Mustache/Loader/ArrayLoader.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -41,7 +41,7 @@ class Mustache_Loader_ArrayLoader implements Mustache_Loader, Mustache_Loader_Mu
     /**
      * Load a Template.
      *
-     * @throws Mustache_Exception_UnknownTemplateException If a template file is not found.
+     * @throws Mustache_Exception_UnknownTemplateException If a template file is not found
      *
      * @param string $name
      *
diff --git a/src/Mustache/Loader/CascadingLoader.php b/src/Mustache/Loader/CascadingLoader.php
index 09a376c..b4726bc 100644
--- a/src/Mustache/Loader/CascadingLoader.php
+++ b/src/Mustache/Loader/CascadingLoader.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -48,7 +48,7 @@ class Mustache_Loader_CascadingLoader implements Mustache_Loader
     /**
      * Load a Template by name.
      *
-     * @throws Mustache_Exception_UnknownTemplateException If a template file is not found.
+     * @throws Mustache_Exception_UnknownTemplateException If a template file is not found
      *
      * @param string $name
      *
diff --git a/src/Mustache/Loader/FilesystemLoader.php b/src/Mustache/Loader/FilesystemLoader.php
index e2aab78..a313751 100644
--- a/src/Mustache/Loader/FilesystemLoader.php
+++ b/src/Mustache/Loader/FilesystemLoader.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -40,9 +40,9 @@ class Mustache_Loader_FilesystemLoader implements Mustache_Loader
      *         'extension' => '.ms',
      *     );
      *
-     * @throws Mustache_Exception_RuntimeException if $baseDir does not exist.
+     * @throws Mustache_Exception_RuntimeException if $baseDir does not exist
      *
-     * @param string $baseDir Base directory containing Mustache template files.
+     * @param string $baseDir Base directory containing Mustache template files
      * @param array  $options Array of Loader options (default: array())
      */
     public function __construct($baseDir, array $options = array())
@@ -53,7 +53,7 @@ class Mustache_Loader_FilesystemLoader implements Mustache_Loader
             $this->baseDir = realpath($this->baseDir);
         }
 
-        if (!is_dir($this->baseDir)) {
+        if ($this->shouldCheckPath() && !is_dir($this->baseDir)) {
             throw new Mustache_Exception_RuntimeException(sprintf('FilesystemLoader baseDir must be a directory: %s', $baseDir));
         }
 
@@ -88,7 +88,7 @@ class Mustache_Loader_FilesystemLoader implements Mustache_Loader
     /**
      * Helper function for loading a Mustache file by name.
      *
-     * @throws Mustache_Exception_UnknownTemplateException If a template file is not found.
+     * @throws Mustache_Exception_UnknownTemplateException If a template file is not found
      *
      * @param string $name
      *
@@ -98,7 +98,7 @@ class Mustache_Loader_FilesystemLoader implements Mustache_Loader
     {
         $fileName = $this->getFileName($name);
 
-        if (!file_exists($fileName)) {
+        if ($this->shouldCheckPath() && !file_exists($fileName)) {
             throw new Mustache_Exception_UnknownTemplateException($name);
         }
 
@@ -121,4 +121,15 @@ class Mustache_Loader_FilesystemLoader implements Mustache_Loader
 
         return $fileName;
     }
+
+    /**
+     * Only check if baseDir is a directory and requested templates are files if
+     * baseDir is using the filesystem stream wrapper.
+     *
+     * @return bool Whether to check `is_dir` and `file_exists`
+     */
+    protected function shouldCheckPath()
+    {
+        return strpos($this->baseDir, '://') === false || strpos($this->baseDir, 'file://') === 0;
+    }
 }
diff --git a/src/Mustache/Loader/InlineLoader.php b/src/Mustache/Loader/InlineLoader.php
index 2970937..f6d4b17 100644
--- a/src/Mustache/Loader/InlineLoader.php
+++ b/src/Mustache/Loader/InlineLoader.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -68,7 +68,7 @@ class Mustache_Loader_InlineLoader implements Mustache_Loader
      * @param string $fileName The file to parse for inline templates
      * @param int    $offset   A string offset for the start of the templates.
      *                         This usually coincides with the `__halt_compiler`
-     *                         call, and the `__COMPILER_HALT_OFFSET__`.
+     *                         call, and the `__COMPILER_HALT_OFFSET__`
      */
     public function __construct($fileName, $offset)
     {
@@ -87,7 +87,7 @@ class Mustache_Loader_InlineLoader implements Mustache_Loader
     /**
      * Load a Template by name.
      *
-     * @throws Mustache_Exception_UnknownTemplateException If a template file is not found.
+     * @throws Mustache_Exception_UnknownTemplateException If a template file is not found
      *
      * @param string $name
      *
diff --git a/src/Mustache/Loader/MutableLoader.php b/src/Mustache/Loader/MutableLoader.php
index 4855c16..f228d90 100644
--- a/src/Mustache/Loader/MutableLoader.php
+++ b/src/Mustache/Loader/MutableLoader.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Mustache/Loader/StringLoader.php b/src/Mustache/Loader/StringLoader.php
index 99fb38e..79b616b 100644
--- a/src/Mustache/Loader/StringLoader.php
+++ b/src/Mustache/Loader/StringLoader.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Mustache/Logger.php b/src/Mustache/Logger.php
index 93c27f6..324a7ce 100644
--- a/src/Mustache/Logger.php
+++ b/src/Mustache/Logger.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Mustache/Logger/AbstractLogger.php b/src/Mustache/Logger/AbstractLogger.php
index 1c27db9..64bdf66 100644
--- a/src/Mustache/Logger/AbstractLogger.php
+++ b/src/Mustache/Logger/AbstractLogger.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Mustache/Logger/StreamLogger.php b/src/Mustache/Logger/StreamLogger.php
index 88f3000..efb3231 100644
--- a/src/Mustache/Logger/StreamLogger.php
+++ b/src/Mustache/Logger/StreamLogger.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -36,7 +36,7 @@ class Mustache_Logger_StreamLogger extends Mustache_Logger_AbstractLogger
     protected $url    = null;
 
     /**
-     * @throws InvalidArgumentException if the logging level is unknown.
+     * @throws InvalidArgumentException if the logging level is unknown
      *
      * @param resource|string $stream Resource instance or URL
      * @param int             $level  The minimum logging level at which this handler will be triggered
@@ -65,7 +65,7 @@ class Mustache_Logger_StreamLogger extends Mustache_Logger_AbstractLogger
     /**
      * Set the minimum logging level.
      *
-     * @throws Mustache_Exception_InvalidArgumentException if the logging level is unknown.
+     * @throws Mustache_Exception_InvalidArgumentException if the logging level is unknown
      *
      * @param int $level The minimum logging level which will be written
      */
@@ -91,7 +91,7 @@ class Mustache_Logger_StreamLogger extends Mustache_Logger_AbstractLogger
     /**
      * Logs with an arbitrary level.
      *
-     * @throws Mustache_Exception_InvalidArgumentException if the logging level is unknown.
+     * @throws Mustache_Exception_InvalidArgumentException if the logging level is unknown
      *
      * @param mixed  $level
      * @param string $message
@@ -111,8 +111,8 @@ class Mustache_Logger_StreamLogger extends Mustache_Logger_AbstractLogger
     /**
      * Write a record to the log.
      *
-     * @throws Mustache_Exception_LogicException   If neither a stream resource nor url is present.
-     * @throws Mustache_Exception_RuntimeException If the stream url cannot be opened.
+     * @throws Mustache_Exception_LogicException   If neither a stream resource nor url is present
+     * @throws Mustache_Exception_RuntimeException If the stream url cannot be opened
      *
      * @param int    $level   The logging level
      * @param string $message The log message
@@ -139,7 +139,7 @@ class Mustache_Logger_StreamLogger extends Mustache_Logger_AbstractLogger
     /**
      * Gets the name of the logging level.
      *
-     * @throws InvalidArgumentException if the logging level is unknown.
+     * @throws InvalidArgumentException if the logging level is unknown
      *
      * @param int $level
      *
diff --git a/src/Mustache/Parser.php b/src/Mustache/Parser.php
index 7d3559b..adefebd 100644
--- a/src/Mustache/Parser.php
+++ b/src/Mustache/Parser.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -63,7 +63,7 @@ class Mustache_Parser
     /**
      * Helper method for recursively building a parse tree.
      *
-     * @throws Mustache_Exception_SyntaxException when nesting errors or mismatched section tags are encountered.
+     * @throws Mustache_Exception_SyntaxException when nesting errors or mismatched section tags are encountered
      *
      * @param array &$tokens Set of Mustache tokens
      * @param array $parent  Parent token (default: null)
@@ -195,10 +195,10 @@ class Mustache_Parser
      *
      * Returns a whitespace token for indenting partials, if applicable.
      *
-     * @param array $nodes  Parsed nodes.
-     * @param array $tokens Tokens to be parsed.
+     * @param array $nodes  Parsed nodes
+     * @param array $tokens Tokens to be parsed
      *
-     * @return array|null Resulting indent token, if any.
+     * @return array|null Resulting indent token, if any
      */
     private function clearStandaloneLines(array &$nodes, array &$tokens)
     {
@@ -268,7 +268,7 @@ class Mustache_Parser
     /**
      * Check whether a token is allowed inside a parent tag.
      *
-     * @throws Mustache_Exception_SyntaxException if an invalid token is found inside a parent tag.
+     * @throws Mustache_Exception_SyntaxException if an invalid token is found inside a parent tag
      *
      * @param array|null $parent
      * @param array      $token
diff --git a/src/Mustache/Template.php b/src/Mustache/Template.php
index f2d198f..2b7771c 100644
--- a/src/Mustache/Template.php
+++ b/src/Mustache/Template.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/Mustache/Tokenizer.php b/src/Mustache/Tokenizer.php
index a71df2c..27e4d05 100644
--- a/src/Mustache/Tokenizer.php
+++ b/src/Mustache/Tokenizer.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -80,7 +80,7 @@ class Mustache_Tokenizer
     /**
      * Scan and tokenize template source.
      *
-     * @throws Mustache_Exception_SyntaxException when mismatched section tags are encountered.
+     * @throws Mustache_Exception_SyntaxException when mismatched section tags are encountered
      *
      * @param string $text       Mustache template source to tokenize
      * @param string $delimiters Optionally, pass initial opening and closing delimiters (default: null)
diff --git a/test/Mustache/Test/AutoloaderTest.php b/test/Mustache/Test/AutoloaderTest.php
index ebe42df..40af5ee 100644
--- a/test/Mustache/Test/AutoloaderTest.php
+++ b/test/Mustache/Test/AutoloaderTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/Cache/AbstractCacheTest.php b/test/Mustache/Test/Cache/AbstractCacheTest.php
index 77fc18a..d977388 100644
--- a/test/Mustache/Test/Cache/AbstractCacheTest.php
+++ b/test/Mustache/Test/Cache/AbstractCacheTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/Cache/FilesystemCacheTest.php b/test/Mustache/Test/Cache/FilesystemCacheTest.php
index f3fead5..2413125 100644
--- a/test/Mustache/Test/Cache/FilesystemCacheTest.php
+++ b/test/Mustache/Test/Cache/FilesystemCacheTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/CompilerTest.php b/test/Mustache/Test/CompilerTest.php
index e11bd98..725a82c 100644
--- a/test/Mustache/Test/CompilerTest.php
+++ b/test/Mustache/Test/CompilerTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/ContextTest.php b/test/Mustache/Test/ContextTest.php
index 5d700fd..029c2ba 100644
--- a/test/Mustache/Test/ContextTest.php
+++ b/test/Mustache/Test/ContextTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/EngineTest.php b/test/Mustache/Test/EngineTest.php
index ab56185..e8743d7 100644
--- a/test/Mustache/Test/EngineTest.php
+++ b/test/Mustache/Test/EngineTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -317,7 +317,7 @@ class Mustache_Test_EngineTest extends Mustache_Test_FunctionalTestCase
         list($name, $mustache) = $this->getLoggedMustache(Mustache_Logger::DEBUG);
         $mustache->render('{{ foo }}{{> bar }}', array('foo' => 'FOO'));
         $log = file_get_contents($name);
-        $this->assertContains('DEBUG: Instantiating template: ',   $log);
+        $this->assertContains('DEBUG: Instantiating template: ', $log);
         $this->assertContains('WARNING: Partial not found: "bar"', $log);
     }
 
diff --git a/test/Mustache/Test/Exception/SyntaxExceptionTest.php b/test/Mustache/Test/Exception/SyntaxExceptionTest.php
index fe85bef..3f6b2e4 100644
--- a/test/Mustache/Test/Exception/SyntaxExceptionTest.php
+++ b/test/Mustache/Test/Exception/SyntaxExceptionTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -24,4 +24,16 @@ class Mustache_Test_Exception_SyntaxExceptionTest extends PHPUnit_Framework_Test
         $e = new Mustache_Exception_SyntaxException('ignore this', $token);
         $this->assertEquals($token, $e->getToken());
     }
+
+    public function testPrevious()
+    {
+        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+            $this->markTestSkipped('Exception chaining requires at least PHP 5.3');
+        }
+
+        $previous = new Exception();
+        $e = new Mustache_Exception_SyntaxException('foo', array(), $previous);
+
+        $this->assertSame($previous, $e->getPrevious());
+    }
 }
diff --git a/test/Mustache/Test/Exception/UnknownFilterExceptionTest.php b/test/Mustache/Test/Exception/UnknownFilterExceptionTest.php
index e5fe263..049c842 100644
--- a/test/Mustache/Test/Exception/UnknownFilterExceptionTest.php
+++ b/test/Mustache/Test/Exception/UnknownFilterExceptionTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -29,4 +29,16 @@ class Mustache_Test_Exception_UnknownFilterExceptionTest extends PHPUnit_Framewo
         $e = new Mustache_Exception_UnknownFilterException('eggs');
         $this->assertEquals('eggs', $e->getFilterName());
     }
+
+    public function testPrevious()
+    {
+        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+            $this->markTestSkipped('Exception chaining requires at least PHP 5.3');
+        }
+
+        $previous = new Exception();
+        $e = new Mustache_Exception_UnknownFilterException('foo', $previous);
+
+        $this->assertSame($previous, $e->getPrevious());
+    }
 }
diff --git a/test/Mustache/Test/Exception/UnknownHelperExceptionTest.php b/test/Mustache/Test/Exception/UnknownHelperExceptionTest.php
index c45d15c..b1682cd 100644
--- a/test/Mustache/Test/Exception/UnknownHelperExceptionTest.php
+++ b/test/Mustache/Test/Exception/UnknownHelperExceptionTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -29,4 +29,15 @@ class Mustache_Test_Exception_UnknownHelperExceptionTest extends PHPUnit_Framewo
         $e = new Mustache_Exception_UnknownHelperException('gamma');
         $this->assertEquals('gamma', $e->getHelperName());
     }
+
+    public function testPrevious()
+    {
+        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+            $this->markTestSkipped('Exception chaining requires at least PHP 5.3');
+        }
+
+        $previous = new Exception();
+        $e = new Mustache_Exception_UnknownHelperException('foo', $previous);
+        $this->assertSame($previous, $e->getPrevious());
+    }
 }
diff --git a/test/Mustache/Test/Exception/UnknownTemplateExceptionTest.php b/test/Mustache/Test/Exception/UnknownTemplateExceptionTest.php
index 61cdd2f..2452749 100644
--- a/test/Mustache/Test/Exception/UnknownTemplateExceptionTest.php
+++ b/test/Mustache/Test/Exception/UnknownTemplateExceptionTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -29,4 +29,15 @@ class Mustache_Test_Exception_UnknownTemplateExceptionTest extends PHPUnit_Frame
         $e = new Mustache_Exception_UnknownTemplateException('yoshi');
         $this->assertEquals('yoshi', $e->getTemplateName());
     }
+
+    public function testPrevious()
+    {
+        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+            $this->markTestSkipped('Exception chaining requires at least PHP 5.3');
+        }
+
+        $previous = new Exception();
+        $e = new Mustache_Exception_UnknownTemplateException('foo', $previous);
+        $this->assertSame($previous, $e->getPrevious());
+    }
 }
diff --git a/test/Mustache/Test/FiveThree/Functional/ClosureQuirksTest.php b/test/Mustache/Test/FiveThree/Functional/ClosureQuirksTest.php
index a6f8353..c997a1d 100644
--- a/test/Mustache/Test/FiveThree/Functional/ClosureQuirksTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/ClosureQuirksTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -25,6 +25,8 @@ class Mustache_Test_FiveThree_Functional_ClosureQuirksTest extends PHPUnit_Frame
     public function testClosuresDontLikeItWhenYouTouchTheirProperties()
     {
         $tpl = $this->mustache->loadTemplate('{{ foo.bar }}');
-        $this->assertEquals('', $tpl->render(array('foo' => function () { return 'FOO'; })));
+        $this->assertEquals('', $tpl->render(array('foo' => function () {
+            return 'FOO';
+        })));
     }
 }
diff --git a/test/Mustache/Test/FiveThree/Functional/EngineTest.php b/test/Mustache/Test/FiveThree/Functional/EngineTest.php
index 09e256b..3ed70c7 100644
--- a/test/Mustache/Test/FiveThree/Functional/EngineTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/EngineTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/FiveThree/Functional/FiltersTest.php b/test/Mustache/Test/FiveThree/Functional/FiltersTest.php
index a6236fa..7adc663 100644
--- a/test/Mustache/Test/FiveThree/Functional/FiltersTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/FiltersTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -35,11 +35,11 @@ class Mustache_Test_FiveThree_Functional_FiltersTest extends PHPUnit_Framework_T
     {
         $helpers = array(
             'longdate' => function (\DateTime $value) {
-                    return $value->format('Y-m-d h:m:s');
-                },
+                return $value->format('Y-m-d h:m:s');
+            },
             'echo' => function ($value) {
-                    return array($value, $value, $value);
-                },
+                return array($value, $value, $value);
+            },
         );
 
         return array(
@@ -77,7 +77,7 @@ class Mustache_Test_FiveThree_Functional_FiltersTest extends PHPUnit_Framework_T
         $this->assertEquals('[[2000-01-01 12:01:00]]', $tpl->render($foo));
     }
 
-    const CHAINED_SECTION_FILTERS_TPL = <<<EOS
+    const CHAINED_SECTION_FILTERS_TPL = <<<'EOS'
 {{% FILTERS }}
 {{# word | echo | with_index }}
 {{ key }}: {{ value }}
@@ -143,21 +143,45 @@ EOS;
             array('{{% FILTERS }}{{ foo | bar }}',       array('foo' => 'FOO')),
             array('{{% FILTERS }}{{ foo | bar }}',       array('foo' => 'FOO', 'bar' => 'BAR')),
             array('{{% FILTERS }}{{ foo | bar }}',       array('foo' => 'FOO', 'bar' => array(1, 2))),
-            array('{{% FILTERS }}{{ foo | bar | baz }}', array('foo' => 'FOO', 'bar' => function () { return 'BAR'; })),
-            array('{{% FILTERS }}{{ foo | bar | baz }}', array('foo' => 'FOO', 'baz' => function () { return 'BAZ'; })),
-            array('{{% FILTERS }}{{ foo | bar | baz }}', array('bar' => function () { return 'BAR'; })),
-            array('{{% FILTERS }}{{ foo | bar | baz }}', array('baz' => function () { return 'BAZ'; })),
-            array('{{% FILTERS }}{{ foo | bar.baz }}',   array('foo' => 'FOO', 'bar' => function () { return 'BAR'; }, 'baz' => function () { return 'BAZ'; })),
+            array('{{% FILTERS }}{{ foo | bar | baz }}', array('foo' => 'FOO', 'bar' => function () {
+                return 'BAR';
+            })),
+            array('{{% FILTERS }}{{ foo | bar | baz }}', array('foo' => 'FOO', 'baz' => function () {
+                return 'BAZ';
+            })),
+            array('{{% FILTERS }}{{ foo | bar | baz }}', array('bar' => function () {
+                return 'BAR';
+            })),
+            array('{{% FILTERS }}{{ foo | bar | baz }}', array('baz' => function () {
+                return 'BAZ';
+            })),
+            array('{{% FILTERS }}{{ foo | bar.baz }}',   array('foo' => 'FOO', 'bar' => function () {
+                return 'BAR';
+            }, 'baz' => function () {
+                return 'BAZ';
+            })),
 
             array('{{% FILTERS }}{{# foo | bar }}{{ . }}{{/ foo | bar }}',             array()),
             array('{{% FILTERS }}{{# foo | bar }}{{ . }}{{/ foo | bar }}',             array('foo' => 'FOO')),
             array('{{% FILTERS }}{{# foo | bar }}{{ . }}{{/ foo | bar }}',             array('foo' => 'FOO', 'bar' => 'BAR')),
             array('{{% FILTERS }}{{# foo | bar }}{{ . }}{{/ foo | bar }}',             array('foo' => 'FOO', 'bar' => array(1, 2))),
-            array('{{% FILTERS }}{{# foo | bar | baz }}{{ . }}{{/ foo | bar | baz }}', array('foo' => 'FOO', 'bar' => function () { return 'BAR'; })),
-            array('{{% FILTERS }}{{# foo | bar | baz }}{{ . }}{{/ foo | bar | baz }}', array('foo' => 'FOO', 'baz' => function () { return 'BAZ'; })),
-            array('{{% FILTERS }}{{# foo | bar | baz }}{{ . }}{{/ foo | bar | baz }}', array('bar' => function () { return 'BAR'; })),
-            array('{{% FILTERS }}{{# foo | bar | baz }}{{ . }}{{/ foo | bar | baz }}', array('baz' => function () { return 'BAZ'; })),
-            array('{{% FILTERS }}{{# foo | bar.baz }}{{ . }}{{/ foo | bar.baz }}',     array('foo' => 'FOO', 'bar' => function () { return 'BAR'; }, 'baz' => function () { return 'BAZ'; })),
+            array('{{% FILTERS }}{{# foo | bar | baz }}{{ . }}{{/ foo | bar | baz }}', array('foo' => 'FOO', 'bar' => function () {
+                return 'BAR';
+            })),
+            array('{{% FILTERS }}{{# foo | bar | baz }}{{ . }}{{/ foo | bar | baz }}', array('foo' => 'FOO', 'baz' => function () {
+                return 'BAZ';
+            })),
+            array('{{% FILTERS }}{{# foo | bar | baz }}{{ . }}{{/ foo | bar | baz }}', array('bar' => function () {
+                return 'BAR';
+            })),
+            array('{{% FILTERS }}{{# foo | bar | baz }}{{ . }}{{/ foo | bar | baz }}', array('baz' => function () {
+                return 'BAZ';
+            })),
+            array('{{% FILTERS }}{{# foo | bar.baz }}{{ . }}{{/ foo | bar.baz }}',     array('foo' => 'FOO', 'bar' => function () {
+                return 'BAR';
+            }, 'baz' => function () {
+                return 'BAZ';
+            })),
         );
     }
 }
diff --git a/test/Mustache/Test/FiveThree/Functional/HigherOrderSectionsTest.php b/test/Mustache/Test/FiveThree/Functional/HigherOrderSectionsTest.php
index 8abd209..f926fdf 100644
--- a/test/Mustache/Test/FiveThree/Functional/HigherOrderSectionsTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/HigherOrderSectionsTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/FiveThree/Functional/LambdaHelperTest.php b/test/Mustache/Test/FiveThree/Functional/LambdaHelperTest.php
index 48f2465..c67957e 100644
--- a/test/Mustache/Test/FiveThree/Functional/LambdaHelperTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/LambdaHelperTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/FiveThree/Functional/MustacheSpecTest.php b/test/Mustache/Test/FiveThree/Functional/MustacheSpecTest.php
index 6db379f..d72686d 100644
--- a/test/Mustache/Test/FiveThree/Functional/MustacheSpecTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/MustacheSpecTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php b/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php
index 8fcfc04..605003c 100644
--- a/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,18 +17,18 @@ class Mustache_Test_FiveThree_Functional_PartialLambdaIndentTest extends PHPUnit
 {
     public function testLambdasInsidePartialsAreIndentedProperly()
     {
-        $src = <<<EOS
+        $src = <<<'EOS'
 <fieldset>
   {{> input }}
 </fieldset>
 
 EOS;
-        $partial = <<<EOS
+        $partial = <<<'EOS'
 <input placeholder="{{# _t }}Enter your name{{/ _t }}">
 
 EOS;
 
-        $expected = <<<EOS
+        $expected = <<<'EOS'
 <fieldset>
   <input placeholder="ENTER YOUR NAME">
 </fieldset>
@@ -47,18 +47,18 @@ EOS;
 
     public function testLambdaInterpolationsInsidePartialsAreIndentedProperly()
     {
-        $src = <<<EOS
+        $src = <<<'EOS'
 <fieldset>
   {{> input }}
 </fieldset>
 
 EOS;
-        $partial = <<<EOS
+        $partial = <<<'EOS'
 <input placeholder="{{ placeholder }}">
 
 EOS;
 
-        $expected = <<<EOS
+        $expected = <<<'EOS'
 <fieldset>
   <input placeholder="Enter your name">
 </fieldset>
diff --git a/test/Mustache/Test/FiveThree/Functional/StrictCallablesTest.php b/test/Mustache/Test/FiveThree/Functional/StrictCallablesTest.php
index 8fe64d8..fc91072 100644
--- a/test/Mustache/Test/FiveThree/Functional/StrictCallablesTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/StrictCallablesTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -52,7 +52,9 @@ class Mustache_Test_FiveThree_Functional_StrictCallablesTest extends PHPUnit_Fra
             ),
             array(
                 false,
-                function () { return 'Yoshi'; },
+                function () {
+                    return 'Yoshi';
+                },
                 $lambda,
                 'YOSHI',
             ),
@@ -80,7 +82,9 @@ class Mustache_Test_FiveThree_Functional_StrictCallablesTest extends PHPUnit_Fra
             // Strict interpolation lambdas
             array(
                 true,
-                function () { return 'Yoshi'; },
+                function () {
+                    return 'Yoshi';
+                },
                 $lambda,
                 'YOSHI',
             ),
diff --git a/test/Mustache/Test/Functional/CallTest.php b/test/Mustache/Test/Functional/CallTest.php
index 7ffd53e..fddeacf 100644
--- a/test/Mustache/Test/Functional/CallTest.php
+++ b/test/Mustache/Test/Functional/CallTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -32,6 +32,7 @@ class Mustache_Test_Functional_CallTest extends PHPUnit_Framework_TestCase
 class Mustache_Test_Functional_ClassWithCall
 {
     public $name;
+
     public function __call($method, $args)
     {
         return 'unknown value';
diff --git a/test/Mustache/Test/Functional/ExamplesTest.php b/test/Mustache/Test/Functional/ExamplesTest.php
index e33384a..d7ef51a 100644
--- a/test/Mustache/Test/Functional/ExamplesTest.php
+++ b/test/Mustache/Test/Functional/ExamplesTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/Functional/HigherOrderSectionsTest.php b/test/Mustache/Test/Functional/HigherOrderSectionsTest.php
index 956d8cd..e2f68b0 100644
--- a/test/Mustache/Test/Functional/HigherOrderSectionsTest.php
+++ b/test/Mustache/Test/Functional/HigherOrderSectionsTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/Functional/InheritanceTest.php b/test/Mustache/Test/Functional/InheritanceTest.php
index 598e798..b39555f 100644
--- a/test/Mustache/Test/Functional/InheritanceTest.php
+++ b/test/Mustache/Test/Functional/InheritanceTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * @group inheritance
  * @group functional
@@ -84,6 +93,15 @@ class Mustache_Test_Functional_InheritanceTest extends PHPUnit_Framework_TestCas
                 '{{<foo}}set by template{{$baz}}also set by template{{/baz}}{{/foo}}',
                 'also set by template',
             ),
+            array(
+                array(
+                    'foo' => '{{$a}}FAIL!{{/a}}',
+                    'bar' => 'WIN!!',
+                ),
+                array(),
+                '{{<foo}}{{$a}}{{<bar}}FAIL{{/bar}}{{/a}}{{/foo}}',
+                'WIN!!',
+            ),
         );
     }
 
diff --git a/test/Mustache/Test/Functional/MustacheInjectionTest.php b/test/Mustache/Test/Functional/MustacheInjectionTest.php
index ee87f38..d0bdb48 100644
--- a/test/Mustache/Test/Functional/MustacheInjectionTest.php
+++ b/test/Mustache/Test/Functional/MustacheInjectionTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/Functional/MustacheSpecTest.php b/test/Mustache/Test/Functional/MustacheSpecTest.php
index bdf851a..7ba0843 100644
--- a/test/Mustache/Test/Functional/MustacheSpecTest.php
+++ b/test/Mustache/Test/Functional/MustacheSpecTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/Functional/NestedPartialIndentTest.php b/test/Mustache/Test/Functional/NestedPartialIndentTest.php
index b3bad37..673339c 100644
--- a/test/Mustache/Test/Functional/NestedPartialIndentTest.php
+++ b/test/Mustache/Test/Functional/NestedPartialIndentTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/Functional/ObjectSectionTest.php b/test/Mustache/Test/Functional/ObjectSectionTest.php
index 1cfb8c7..963b0f7 100644
--- a/test/Mustache/Test/Functional/ObjectSectionTest.php
+++ b/test/Mustache/Test/Functional/ObjectSectionTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/FunctionalTestCase.php b/test/Mustache/Test/FunctionalTestCase.php
index 3cb5581..59185d1 100644
--- a/test/Mustache/Test/FunctionalTestCase.php
+++ b/test/Mustache/Test/FunctionalTestCase.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/HelperCollectionTest.php b/test/Mustache/Test/HelperCollectionTest.php
index 17e6b85..df64e97 100644
--- a/test/Mustache/Test/HelperCollectionTest.php
+++ b/test/Mustache/Test/HelperCollectionTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/Loader/ArrayLoaderTest.php b/test/Mustache/Test/Loader/ArrayLoaderTest.php
index 8abccd7..9960c9b 100644
--- a/test/Mustache/Test/Loader/ArrayLoaderTest.php
+++ b/test/Mustache/Test/Loader/ArrayLoaderTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/Loader/CascadingLoaderTest.php b/test/Mustache/Test/Loader/CascadingLoaderTest.php
index 13c7299..6d97d8d 100644
--- a/test/Mustache/Test/Loader/CascadingLoaderTest.php
+++ b/test/Mustache/Test/Loader/CascadingLoaderTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/Loader/FilesystemLoaderTest.php b/test/Mustache/Test/Loader/FilesystemLoaderTest.php
index 20b75c1..75880d4 100644
--- a/test/Mustache/Test/Loader/FilesystemLoaderTest.php
+++ b/test/Mustache/Test/Loader/FilesystemLoaderTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -33,7 +33,7 @@ class Mustache_Test_Loader_FilesystemLoaderTest extends PHPUnit_Framework_TestCa
     {
         $baseDir = realpath(dirname(__FILE__) . '/../../../fixtures/templates');
 
-        $loader = new Mustache_Loader_FilesystemLoader('file://' . $baseDir, array('extension' => '.ms'));
+        $loader = new Mustache_Loader_FilesystemLoader('test://' . $baseDir, array('extension' => '.ms'));
         $this->assertEquals('alpha contents', $loader->load('alpha'));
         $this->assertEquals('beta contents', $loader->load('beta.ms'));
     }
diff --git a/test/Mustache/Test/Loader/StringLoaderTest.php b/test/Mustache/Test/Loader/StringLoaderTest.php
index 87b537b..f2e47d9 100644
--- a/test/Mustache/Test/Loader/StringLoaderTest.php
+++ b/test/Mustache/Test/Loader/StringLoaderTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/Logger/AbstractLoggerTest.php b/test/Mustache/Test/Logger/AbstractLoggerTest.php
index 1aac4df..e8865e9 100644
--- a/test/Mustache/Test/Logger/AbstractLoggerTest.php
+++ b/test/Mustache/Test/Logger/AbstractLoggerTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/Logger/StreamLoggerTest.php b/test/Mustache/Test/Logger/StreamLoggerTest.php
index dadc765..6cb198a 100644
--- a/test/Mustache/Test/Logger/StreamLoggerTest.php
+++ b/test/Mustache/Test/Logger/StreamLoggerTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/ParserTest.php b/test/Mustache/Test/ParserTest.php
index 6dd5a9e..85e5701 100644
--- a/test/Mustache/Test/ParserTest.php
+++ b/test/Mustache/Test/ParserTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/SpecTestCase.php b/test/Mustache/Test/SpecTestCase.php
index 4a8dd29..9fb4a15 100644
--- a/test/Mustache/Test/SpecTestCase.php
+++ b/test/Mustache/Test/SpecTestCase.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/TemplateTest.php b/test/Mustache/Test/TemplateTest.php
index 1547873..bb260d2 100644
--- a/test/Mustache/Test/TemplateTest.php
+++ b/test/Mustache/Test/TemplateTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/Mustache/Test/TokenizerTest.php b/test/Mustache/Test/TokenizerTest.php
index 7056eb2..09be3fe 100644
--- a/test/Mustache/Test/TokenizerTest.php
+++ b/test/Mustache/Test/TokenizerTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/bootstrap.php b/test/bootstrap.php
index fd06b53..0c3c631 100644
--- a/test/bootstrap.php
+++ b/test/bootstrap.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,3 +14,77 @@ Mustache_Autoloader::register();
 Mustache_Autoloader::register(dirname(__FILE__) . '/../test');
 
 require dirname(__FILE__) . '/../vendor/yaml/lib/sfYamlParser.php';
+
+/**
+ * Minimal stream wrapper to test protocol-based access to templates.
+ */
+class TestStream
+{
+    private $filehandle;
+
+    /**
+     * Always returns false.
+     *
+     * @param string $path
+     * @param int    $flags
+     *
+     * @return array
+     */
+    public function url_stat($path, $flags)
+    {
+        return false;
+    }
+
+    /**
+     * Open the file.
+     *
+     * @param string $path
+     * @param string $mode
+     *
+     * @return bool
+     */
+    public function stream_open($path, $mode)
+    {
+        $path = preg_replace('-^test://-', '', $path);
+        $this->filehandle = fopen($path, $mode);
+
+        return $this->filehandle !== false;
+    }
+
+    /**
+     * @return array
+     */
+    public function stream_stat()
+    {
+        return [];
+    }
+
+    /**
+     * @param int $count
+     *
+     * @return string
+     */
+    public function stream_read($count)
+    {
+        return fgets($this->filehandle, $count);
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_eof()
+    {
+        return feof($this->filehandle);
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_close()
+    {
+        return fclose($this->filehandle);
+    }
+}
+
+stream_wrapper_register('test', TestStream::class)
+    || die('Failed to register protocol');
diff --git a/test/fixtures/autoloader/Mustache/Bar.php b/test/fixtures/autoloader/Mustache/Bar.php
index 8d64463..8092722 100644
--- a/test/fixtures/autoloader/Mustache/Bar.php
+++ b/test/fixtures/autoloader/Mustache/Bar.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/fixtures/autoloader/Mustache/Foo.php b/test/fixtures/autoloader/Mustache/Foo.php
index 4b3bfc0..7e6ef3a 100644
--- a/test/fixtures/autoloader/Mustache/Foo.php
+++ b/test/fixtures/autoloader/Mustache/Foo.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/fixtures/autoloader/NonMustacheClass.php b/test/fixtures/autoloader/NonMustacheClass.php
index 4e0f372..d8d5929 100644
--- a/test/fixtures/autoloader/NonMustacheClass.php
+++ b/test/fixtures/autoloader/NonMustacheClass.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Mustache.php.
  *
- * (c) 2010-2015 Justin Hileman
+ * (c) 2010-2016 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/fixtures/examples/blocks/Blocks.php b/test/fixtures/examples/blocks/Blocks.php
index 4b7031c..2a7cb20 100644
--- a/test/fixtures/examples/blocks/Blocks.php
+++ b/test/fixtures/examples/blocks/Blocks.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class Blocks
 {
     public $items = array(1, 2, 3);
diff --git a/test/fixtures/examples/child_context/ChildContext.php b/test/fixtures/examples/child_context/ChildContext.php
index bae81c6..9ef84ae 100644
--- a/test/fixtures/examples/child_context/ChildContext.php
+++ b/test/fixtures/examples/child_context/ChildContext.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class ChildContext
 {
     public $parent = array(
diff --git a/test/fixtures/examples/comments/Comments.php b/test/fixtures/examples/comments/Comments.php
index afabd22..690d139 100644
--- a/test/fixtures/examples/comments/Comments.php
+++ b/test/fixtures/examples/comments/Comments.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class Comments
 {
     public function title()
diff --git a/test/fixtures/examples/complex/complex.php b/test/fixtures/examples/complex/complex.php
index 68f068b..ebb2733 100644
--- a/test/fixtures/examples/complex/complex.php
+++ b/test/fixtures/examples/complex/complex.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class Complex
 {
     public $header = 'Colors';
diff --git a/test/fixtures/examples/delimiters/Delimiters.php b/test/fixtures/examples/delimiters/Delimiters.php
index 6db842a..e3b044d 100644
--- a/test/fixtures/examples/delimiters/Delimiters.php
+++ b/test/fixtures/examples/delimiters/Delimiters.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class Delimiters
 {
     public $start = 'It worked the first time.';
diff --git a/test/fixtures/examples/dot_notation/DotNotation.php b/test/fixtures/examples/dot_notation/DotNotation.php
index 7edbc00..d400318 100644
--- a/test/fixtures/examples/dot_notation/DotNotation.php
+++ b/test/fixtures/examples/dot_notation/DotNotation.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class DotNotation
 {
     public $person = array(
diff --git a/test/fixtures/examples/double_section/DoubleSection.php b/test/fixtures/examples/double_section/DoubleSection.php
index f4e87a8..6989d95 100644
--- a/test/fixtures/examples/double_section/DoubleSection.php
+++ b/test/fixtures/examples/double_section/DoubleSection.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class DoubleSection
 {
     public function t()
diff --git a/test/fixtures/examples/escaped/Escaped.php b/test/fixtures/examples/escaped/Escaped.php
index 47bb7f8..2e5805b 100644
--- a/test/fixtures/examples/escaped/Escaped.php
+++ b/test/fixtures/examples/escaped/Escaped.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class Escaped
 {
     public $title = '"Bear" > "Shark"';
diff --git a/test/fixtures/examples/filters/Filters.php b/test/fixtures/examples/filters/Filters.php
index 1899ab4..fb7c3f5 100644
--- a/test/fixtures/examples/filters/Filters.php
+++ b/test/fixtures/examples/filters/Filters.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class Filters
 {
     public $states = array(
diff --git a/test/fixtures/examples/grand_parent_context/GrandParentContext.php b/test/fixtures/examples/grand_parent_context/GrandParentContext.php
index af8173f..e3ea25f 100644
--- a/test/fixtures/examples/grand_parent_context/GrandParentContext.php
+++ b/test/fixtures/examples/grand_parent_context/GrandParentContext.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class GrandParentContext
 {
     public $grand_parent_id = 'grand_parent1';
diff --git a/test/fixtures/examples/i18n/I18n.php b/test/fixtures/examples/i18n/I18n.php
index 8508a59..77dc7b2 100644
--- a/test/fixtures/examples/i18n/I18n.php
+++ b/test/fixtures/examples/i18n/I18n.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class I18n
 {
     // Variable to be interpolated
diff --git a/test/fixtures/examples/implicit_iterator/ImplicitIterator.php b/test/fixtures/examples/implicit_iterator/ImplicitIterator.php
index 6cb7644..6a26477 100644
--- a/test/fixtures/examples/implicit_iterator/ImplicitIterator.php
+++ b/test/fixtures/examples/implicit_iterator/ImplicitIterator.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class ImplicitIterator
 {
     public $data = array('Donkey Kong', 'Luigi', 'Mario', 'Peach', 'Yoshi');
diff --git a/test/fixtures/examples/inverted_double_section/InvertedDoubleSection.php b/test/fixtures/examples/inverted_double_section/InvertedDoubleSection.php
index 6f1657f..7946640 100644
--- a/test/fixtures/examples/inverted_double_section/InvertedDoubleSection.php
+++ b/test/fixtures/examples/inverted_double_section/InvertedDoubleSection.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class InvertedDoubleSection
 {
     public $t = false;
diff --git a/test/fixtures/examples/inverted_section/InvertedSection.php b/test/fixtures/examples/inverted_section/InvertedSection.php
index 3fea2b2..a4ab8d5 100644
--- a/test/fixtures/examples/inverted_section/InvertedSection.php
+++ b/test/fixtures/examples/inverted_section/InvertedSection.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class InvertedSection
 {
     public $repo = array();
diff --git a/test/fixtures/examples/nested_partials/NestedPartials.php b/test/fixtures/examples/nested_partials/NestedPartials.php
index 632639e..1a5afd3 100644
--- a/test/fixtures/examples/nested_partials/NestedPartials.php
+++ b/test/fixtures/examples/nested_partials/NestedPartials.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class NestedPartials
 {
     public $val = 'FOURTH!';
diff --git a/test/fixtures/examples/partials/Partials.php b/test/fixtures/examples/partials/Partials.php
index 157bb3a..1bdaaa1 100644
--- a/test/fixtures/examples/partials/Partials.php
+++ b/test/fixtures/examples/partials/Partials.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class Partials
 {
     public $page = array(
diff --git a/test/fixtures/examples/recursive_partials/RecursivePartials.php b/test/fixtures/examples/recursive_partials/RecursivePartials.php
index b9a8947..25d15fd 100644
--- a/test/fixtures/examples/recursive_partials/RecursivePartials.php
+++ b/test/fixtures/examples/recursive_partials/RecursivePartials.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class RecursivePartials
 {
     public $name  = 'George';
diff --git a/test/fixtures/examples/section_iterator_objects/SectionIteratorObjects.php b/test/fixtures/examples/section_iterator_objects/SectionIteratorObjects.php
index 9a50342..77e083e 100644
--- a/test/fixtures/examples/section_iterator_objects/SectionIteratorObjects.php
+++ b/test/fixtures/examples/section_iterator_objects/SectionIteratorObjects.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class SectionIteratorObjects
 {
     public $start = 'It worked the first time.';
diff --git a/test/fixtures/examples/section_magic_objects/SectionMagicObjects.php b/test/fixtures/examples/section_magic_objects/SectionMagicObjects.php
index e9f6645..54288d6 100644
--- a/test/fixtures/examples/section_magic_objects/SectionMagicObjects.php
+++ b/test/fixtures/examples/section_magic_objects/SectionMagicObjects.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class SectionMagicObjects
 {
     public $start = 'It worked the first time.';
diff --git a/test/fixtures/examples/section_objects/SectionObjects.php b/test/fixtures/examples/section_objects/SectionObjects.php
index 0b6cc56..b977ec5 100644
--- a/test/fixtures/examples/section_objects/SectionObjects.php
+++ b/test/fixtures/examples/section_objects/SectionObjects.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class SectionObjects
 {
     public $start = 'It worked the first time.';
diff --git a/test/fixtures/examples/sections/Sections.php b/test/fixtures/examples/sections/Sections.php
index 5e52485..86bc893 100644
--- a/test/fixtures/examples/sections/Sections.php
+++ b/test/fixtures/examples/sections/Sections.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class Sections
 {
     public $start = 'It worked the first time.';
diff --git a/test/fixtures/examples/sections_nested/SectionsNested.php b/test/fixtures/examples/sections_nested/SectionsNested.php
index 23dac63..dccc0d9 100644
--- a/test/fixtures/examples/sections_nested/SectionsNested.php
+++ b/test/fixtures/examples/sections_nested/SectionsNested.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class SectionsNested
 {
     public $name = 'Little Mac';
diff --git a/test/fixtures/examples/simple/Simple.php b/test/fixtures/examples/simple/Simple.php
index cfc746b..570af22 100644
--- a/test/fixtures/examples/simple/Simple.php
+++ b/test/fixtures/examples/simple/Simple.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class Simple
 {
     public $name = 'Chris';
@@ -11,4 +20,4 @@ class Simple
     }
 
     public $in_ca = true;
-};
+}
diff --git a/test/fixtures/examples/unescaped/Unescaped.php b/test/fixtures/examples/unescaped/Unescaped.php
index f271aa0..abe9178 100644
--- a/test/fixtures/examples/unescaped/Unescaped.php
+++ b/test/fixtures/examples/unescaped/Unescaped.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class Unescaped
 {
     public $title = 'Bear > Shark';
diff --git a/test/fixtures/examples/utf8/UTF8.php b/test/fixtures/examples/utf8/UTF8.php
index e5a7877..8c14941 100644
--- a/test/fixtures/examples/utf8/UTF8.php
+++ b/test/fixtures/examples/utf8/UTF8.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class UTF8
 {
     public $test = '中文又来啦';
diff --git a/test/fixtures/examples/utf8_unescaped/UTF8Unescaped.php b/test/fixtures/examples/utf8_unescaped/UTF8Unescaped.php
index 6aa4e8f..4309675 100644
--- a/test/fixtures/examples/utf8_unescaped/UTF8Unescaped.php
+++ b/test/fixtures/examples/utf8_unescaped/UTF8Unescaped.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class UTF8Unescaped
 {
     public $test = '中文又来啦';
diff --git a/test/fixtures/examples/whitespace/Whitespace.php b/test/fixtures/examples/whitespace/Whitespace.php
index a189b9e..d5a5c62 100644
--- a/test/fixtures/examples/whitespace/Whitespace.php
+++ b/test/fixtures/examples/whitespace/Whitespace.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Mustache.php.
+ *
+ * (c) 2010-2016 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Whitespace test for tag names.
  *