diff --git a/.travis.yml b/.travis.yml
index 870852e..3e22253 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,12 @@
 language: php
 
 php:
-    - 5.3
-    - 5.4
+    - 5.5
+    - 5.6
+    - 7.0
+    - 7.1
 
 before_script:
     - composer install --dev
 
-script: phpunit
+script: ./vendor/bin/phpunit
diff --git a/README.md b/README.md
index 87115a4..8c18c5b 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,8 @@
 # HtmlConverterBundle
 
 The `HtmlConverterBundle` integrates the [HtmlConverter](https://github.com/bicpi/HtmlConverter)
-library with Symfony2. This means easy HTML to text conversions.
+library with Symfony. This means easy HTML-to-text conversions.
 
-[![Build Status](https://secure.travis-ci.org/bicpi/HtmlConverterBundle.png)](http://travis-ci.org/bicpi/HtmlConverterBundle)
+[![Build Status](https://travis-ci.org/bicpi/HtmlConverter.svg?branch=master)](https://travis-ci.org/bicpi/HtmlConverterBundle)
 
-Dcumentation for this bundle is available in the `Resources/doc` directory:
-
-* [HtmlConverterBundle documentation](https://github.com/bicpi/HtmlConverterBundle/blob/master/Resources/doc/index.md)
+Documentation for this bundle is available in [Resources/doc](Resources/doc/index.md).
diff --git a/Resources/doc/index.md b/Resources/doc/index.md
index 2763a9a..6ba2005 100644
--- a/Resources/doc/index.md
+++ b/Resources/doc/index.md
@@ -1,6 +1,6 @@
 # Intro to HtmlConverterBundle
 
-This bundle offers Symfony2 integration of the **bicpi/HtmlConverter** library.
+This bundle offers Symfony integration of the **bicpi/HtmlConverter** library.
 
 Please also refer to the [bicpi/HtmlConverter documentation](https://github.com/bicpi/HtmlConverter).
 
@@ -13,7 +13,7 @@ See http://getcomposer.org for details.
 ```json
 "require" :  {
     // ...
-    "bicpi/html-converter-bundle": "1.0.*",
+    "bicpi/html-converter-bundle": "^2.0",
 }
 ```
 
@@ -101,8 +101,8 @@ The above example only register the `LynxConverter` and the `SimpleConverter`.
 
 ## Running unit tests
 
-PHPUnit 3.5 or newer is required. To setup and run tests follow these steps:
+To setup and run tests follow these steps:
 
 1. Go to the root directory of this library
-2. Run: `composer install --dev`
-3. Run: `phpunit`
+2. Run: `composer install`
+3. Run: `./vendor/bin/phpunit`
diff --git a/composer.json b/composer.json
index 86443eb..882cebf 100644
--- a/composer.json
+++ b/composer.json
@@ -1,35 +1,35 @@
 {
     "name":        "bicpi/html-converter-bundle",
     "type":        "symfony-bundle",
-    "description": "This bundle provides Symfony2 integration of bicpi's html-converter library",
+    "description": "This bundle provides Symfony integration of bicpi's html-converter library",
     "keywords":    ["html", "text", "converter", "symfony2", "bundle", "bicpi"],
     "homepage":    "http://github.com/bicpi/HtmlConverterBundle",
     "license":     "MIT",
     "authors": [
         {
             "name": "Philipp Rieber",
-            "homepage": "http://philipp-rieber.net"
+            "homepage": "https://philipp-rieber.net"
         }
     ],
     "require": {
-        "php": ">=5.3.2",
-        "bicpi/html-converter": "1.0.*"
+        "php": ">=5.5.9",
+        "bicpi/html-converter": "^2.0"
     },
     "require-dev": {
-        "symfony/dependency-injection": "~2.1",
-        "symfony/http-kernel": "~2.1",
-        "symfony/config": "~2.1",
-        "symfony/yaml": "~2.1"
+        "phpunit/phpunit": "^4.8",
+        "symfony/dependency-injection": "^2.7 || ^3.0",
+        "symfony/http-kernel": "^2.7 || ^3.0",
+        "symfony/config": "^2.7 || ^3.0",
+        "symfony/yaml": "^2.7 || ^3.0"
     },
     "autoload": {
-        "psr-0": {
-            "bicpi\\Bundle\\HtmlConverterBundle": ""
+        "psr-4": {
+            "bicpi\\Bundle\\HtmlConverterBundle\\": ""
         }
     },
-    "target-dir": "bicpi/Bundle/HtmlConverterBundle",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "2.0-dev"
         }
     }
 }