diff --git a/.php_cs b/.php_cs
index f34252f..0965a1b 100644
--- a/.php_cs
+++ b/.php_cs
@@ -1,6 +1,6 @@
 <?php
 
 $config = new Symfony\CS\Config\Config();
-$config->getFinder()->exclude('bin');
+$config->getFinder()->in(__DIR__)->exclude('bin');
 
 return $config;
diff --git a/.travis.yml b/.travis.yml
index e73c8b0..e8b83bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,12 @@
 language: php
+
+before_script:
+  - curl http://cs.sensiolabs.org/get/php-cs-fixer.phar -o php-cs-fixer.phar
+
+script:
+  - phpunit
+  - if [[ `php -r "echo version_compare(PHP_VERSION, '5.3.6', '>=');"` ]]; then php php-cs-fixer.phar --dry-run -v fix .; fi
+
 php:
   - 5.2
   - 5.3
diff --git a/src/Mustache/Context.php b/src/Mustache/Context.php
index 7d1dc90..0115ff0 100644
--- a/src/Mustache/Context.php
+++ b/src/Mustache/Context.php
@@ -42,7 +42,7 @@ class Mustache_Context
     /**
      * Push a new Context frame onto the block context stack.
      *
-     * @param  mixed $value Object or array to use for block context
+     * @param mixed $value Object or array to use for block context
      */
     public function pushBlockContext($value)
     {