diff --git a/.php_cs b/.php_cs
index 4e14fd4..720acd5 100644
--- a/.php_cs
+++ b/.php_cs
@@ -1,13 +1,14 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
+    ->name('.php_cs')
+    ->ignoreDotFiles(false)
     ->exclude('_helpers')
     ->exclude('_temp')
-    ->in(__DIR__)
-;
+    ->in(__DIR__);
 
 return PhpCsFixer\Config::create()
-    ->setRules(array(
+    ->setRules([
         '@Symfony' => true,
         'combine_consecutive_unsets' => true,
         'linebreak_after_opening_tag' => true,
@@ -17,6 +18,5 @@ return PhpCsFixer\Config::create()
         'ordered_imports' => true,
         'phpdoc_order' => true,
         'short_array_syntax' => true,
-    ))
-    ->finder($finder)
-;
+    ])
+    ->finder($finder);
diff --git a/.travis.yml b/.travis.yml
index 339034e..be00e56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,18 @@
 language: php
+sudo: required
+dist: trusty
+group: edge
 
 php:
     - 5.5
     - 5.6
     - 7.0
-    - hhvm
-
-matrix:
-    allow_failures:
-        - php: hhvm
+    - nightly
+    - hhvm-3.12
+    - hhvm-nightly
 
 before_install:
+    - echo $TRAVIS_PHP_VERSION
     - travis_retry composer self-update
 
 install:
@@ -20,12 +22,12 @@ install:
     - travis_retry composer update --no-interaction --prefer-source
 
 before_script:
-    - if [ $TRAVIS_PHP_VERSION != "hhvm" ]; then coverage="--coverage-xml"; fi
+    - if [[ $TRAVIS_PHP_VERSION != hhvm* ]]; then coverage="--coverage-xml"; fi
     - vendor/bin/codecept build
 
 script:
     - php-cs-fixer fix --dry-run
     - vendor/bin/codecept run $coverage
 
-after_script:
+after_success:
     - if [ $coverage != "" ]; then coveralls --verbose; fi
diff --git a/readme.md b/readme.md
index 5f79ef2..f0f30ee 100644
--- a/readme.md
+++ b/readme.md
@@ -1,8 +1,8 @@
 Arachne/ExpressionLanguage
 ====
 
-[![Build Status](https://img.shields.io/travis/Arachne/ExpressionLanguage.svg?style=flat-square)](https://travis-ci.org/Arachne/ExpressionLanguage)
-[![Coverage Status](https://img.shields.io/coveralls/Arachne/ExpressionLanguage.svg?style=flat-square)](https://coveralls.io/github/Arachne/ExpressionLanguage)
+[![Build Status](https://img.shields.io/travis/Arachne/ExpressionLanguage/master.svg?style=flat-square)](https://travis-ci.org/Arachne/ExpressionLanguage/branches)
+[![Coverage Status](https://img.shields.io/coveralls/Arachne/ExpressionLanguage/master.svg?style=flat-square)](https://coveralls.io/github/Arachne/ExpressionLanguage?branch=master)
 [![SensioLabs Insight](https://img.shields.io/sensiolabs/i/9da80aab-e05b-4160-a51e-75251b6a16b8.svg?style=flat-square)](https://insight.sensiolabs.com/projects/9da80aab-e05b-4160-a51e-75251b6a16b8)
 [![VersionEye](https://img.shields.io/versioneye/d/php/arachne:expression-language.svg?style=flat-square)](https://www.versioneye.com/php/arachne:expression-language)
 [![Latest stable](https://img.shields.io/packagist/v/arachne/expression-language.svg?style=flat-square)](https://packagist.org/packages/arachne/expression-language)