diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..798afc40
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+composer.lock
+vendor/
+phpunit.xml
diff --git a/.travis.yml b/.travis.yml
index 28422ddb..3d25dc56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,7 @@ install:
   - composer install --dev --no-interaction
 
 script:
-  - mkdir -p build/logs
-  - php vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+  - vendor/bin/phpunit
 
 after_script:
   - php vendor/bin/coveralls
-  - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
diff --git a/README.md b/README.md
index c4a5d7e8..f5f76eae 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,18 @@
 PHP Html Parser
-==========================
+===============
 
-Version 1.7.0
+Note: this is a fork of [paquettg/php-html-parser](https://github.com/paquettg/php-html-parser). The project is in passive maintenance only. Pull requests are accepted. If you are willing to maintain this package, please create an issue and let us know.
 
-[![Build Status](https://travis-ci.org/paquettg/php-html-parser.png)](https://travis-ci.org/paquettg/php-html-parser)
-[![Coverage Status](https://coveralls.io/repos/paquettg/php-html-parser/badge.png)](https://coveralls.io/r/paquettg/php-html-parser)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/paquettg/php-html-parser/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/paquettg/php-html-parser/?branch=master)
+[![Build Status](https://travis-ci.org/thesoftwarefanatics/php-html-parser.png)](https://travis-ci.org/thesoftwarefanatics/php-html-parser)
+[![Coverage Status](https://coveralls.io/repos/thesoftwarefanatics/php-html-parser/badge.png)](https://coveralls.io/r/thesoftwarefanatics/php-html-parser)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/thesoftwarefanatics/php-html-parser/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/thesoftwarefanatics/php-html-parser/?branch=master)
 
 PHPHtmlParser is a simple, flexible, html parser which allows you to select tags using any css selector, like jQuery. The goal is to assiste in the development of tools which require a quick, easy way to scrap html, whether it's valid or not! This project was original supported by [sunra/php-simple-html-dom-parser](https://github.com/sunra/php-simple-html-dom-parser) but the support seems to have stopped so this project is my adaptation of his previous work.
 
 Install
 -------
 
-This package can be found on [packagist](https://packagist.org/packages/paquettg/php-html-parser) and is best loaded using [composer](http://getcomposer.org/). We support php 5.6, 7.0, and hhvm 2.3.
+This package can be found on [packagist](https://packagist.org/packages/thesoftwarefanatics/php-html-parser) and is best loaded using [composer](http://getcomposer.org/). We support php 5.6, 7.0, and hhvm 2.3.
 
 Usage
 -----
diff --git a/composer.json b/composer.json
index c75e0e46..52ebc838 100644
--- a/composer.json
+++ b/composer.json
@@ -1,20 +1,24 @@
 {
-    "name": "paquettg/php-html-parser",
+    "name": "thesoftwarefanatics/php-html-parser",
     "type": "library",
-    "version": "1.7.0",
     "description": "An HTML DOM parser. It allows you to manipulate HTML. Find tags on an HTML page with selectors just like jQuery.",
     "keywords": ["html", "dom", "parser"],
-    "homepage": "https://github.com/paquettg/php-html-parser",
+    "homepage": "https://github.com/thesoftwarefanatics/php-html-parser",
     "license": "MIT",
     "authors": [
         {
             "name": "Gilles Paquette",
             "email": "paquettg@gmail.com",
             "homepage": "http://gillespaquette.ca"
+        },
+        {
+            "name": "The Software Fanatics GmbH",
+            "email": "dev@thesoftwarefanatics.com",
+            "homepage": "https://thesoftwarefanatics.com"
         }
     ],
     "require": {
-        "php": ">=5.6",
+        "php": "^5.6 || ^7.0",
         "paquettg/string-encode": "~0.1.0"
     },
     "require-dev": {
@@ -23,10 +27,9 @@
         "mockery/mockery": "~0.9.0"
     },
     "autoload": {
-        "psr-0": { 
-        	"PHPHtmlParser": "src/"
-       	}
+        "psr-0": {
+            "PHPHtmlParser": "src/"
+        }
     },
-    "minimum-stability": "dev",
     "prefer-stable": true
 }
diff --git a/phpunit.php b/phpunit.php
deleted file mode 100644
index 25c90c8e..00000000
--- a/phpunit.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
-|--------------------------------------------------------------------------
-| Register The Composer Auto Loader
-|--------------------------------------------------------------------------
-|
-| Composer provides a convenient, automatically generated class loader
-| for our application. We just need to utilize it! We'll require it
-| into the script here so that we do not have to worry about the
-| loading of any our classes "manually". Feels great to relax.
-|
-*/
-
-require __DIR__.'/vendor/autoload.php';
-
-/*
-|--------------------------------------------------------------------------
-| Set The Default Timezone
-|--------------------------------------------------------------------------
-|
-| Here we will set the default timezone for PHP. PHP is notoriously mean
-| if the timezone is not explicitly set. This will be used by each of
-| the PHP date and date-time functions throughout the application.
-|
-*/
-
-date_default_timezone_set('UTC');
diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index 64a402ac..00000000
--- a/phpunit.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-	backupStaticAttributes="false"
-	bootstrap="phpunit.php"
-	colors="true"
-	convertErrorsToExceptions="true"
-	convertNoticesToExceptions="true"
-	convertWarningsToExceptions="true"
-	processIsolation="false"
-	stopOnFailure="false"
-	syntaxCheck="false"
->
-	<testsuites>
-		<testsuite name="Repository Test Suite">
-			<directory>./tests/</directory>
-		</testsuite>
-	</testsuites>
-
-	<filter>
-		<whitelist addUncoveredFilesFromWhitelist="false">
-			<directory suffix=".php">src</directory>
-			<exclude>
-				<directory suffix=".php">vendor</directory>
-			</exclude>
-		</whitelist>
-	</filter>
-</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 00000000..61479923
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+    backupStaticAttributes="false"
+    bootstrap="vendor/autoload.php"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    stopOnFailure="false"
+    syntaxCheck="false"
+>
+    <testsuites>
+        <testsuite name="Repository Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>