diff --git a/.gitignore b/.gitignore
index b871be44..a0a73782 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ composer.lock
 /vendor/
 .idea/
 *.swp
+build/
diff --git a/.travis.yml b/.travis.yml
index 20c077a0..8f3feeb4 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/composer.json b/composer.json
index 96c16d2f..30307c67 100644
--- a/composer.json
+++ b/composer.json
@@ -1,27 +1,31 @@
 {
-    "name": "paquettg/php-html-parser",
+    "name": "muchrm/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/muchrm/php-html-parser",
     "license": "MIT",
     "authors": [
         {
             "name": "Gilles Paquette",
             "email": "paquettg@gmail.com",
             "homepage": "http://gillespaquette.ca"
+        },
+        {
+            "name": "Pongpanot Chuaysakun",
+            "email": "muchrm.me@gmail.com"
         }
     ],
     "require": {
-        "php": ">=5.6",
+        "php": "^5.6 || ^7.0",
         "ext-mbstring": "*",
         "paquettg/string-encode": "~0.1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.7.0",
-        "satooshi/php-coveralls": "~1.0.0",
-        "mockery/mockery": "~0.9.0"
+        "phpunit/phpunit": "~7",
+        "php-coveralls/php-coveralls": "~2.0.0",
+        "mockery/mockery": "~1"
     },
     "autoload": {
         "psr-0": { 
diff --git a/phpunit.xml b/phpunit.xml
index 64a402ac..7cd7a5b2 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -24,4 +24,7 @@
 			</exclude>
 		</whitelist>
 	</filter>
+	<logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
 </phpunit>
diff --git a/src/PHPHtmlParser/Dom.php b/src/PHPHtmlParser/Dom.php
index 22b56ec6..7f9e0f2c 100644
--- a/src/PHPHtmlParser/Dom.php
+++ b/src/PHPHtmlParser/Dom.php
@@ -470,47 +470,35 @@ protected function clean($str)
             // skip entire cleanup step
             return $str;
         }
-
         // remove white space before closing tags
-        $str = mb_eregi_replace("'\s+>", "'>", $str);
-        $str = mb_eregi_replace('"\s+>', '">', $str);
-
+        $str = preg_replace("#'\s+>#i", "'>", $str);
+        $str = preg_replace('#"\s+>#i', '">', $str);
         // clean out the \n\r
         $replace = ' ';
         if ($this->options->get('preserveLineBreaks')) {
             $replace = '&#10;';
         }
         $str = str_replace(["\r\n", "\r", "\n"], $replace, $str);
-
         // strip the doctype
-        $str = mb_eregi_replace("<!doctype(.*?)>", '', $str);
-
+        $str = preg_replace("#<!doctype(.*?)>#i", '', $str);
         // strip out comments
-        $str = mb_eregi_replace("<!--(.*?)-->", '', $str);
-
+        $str = preg_replace("#<!--(.*?)-->#i", '', $str);
         // strip out cdata
-        $str = mb_eregi_replace("<!\[CDATA\[(.*?)\]\]>", '', $str);
-
+        $str = preg_replace("#<!\[CDATA\[(.*?)\]\]>#i", '', $str);
         // strip out <script> tags
         if ($this->options->get('removeScripts') == true) {
-            $str = mb_eregi_replace("<\s*script[^>]*[^/]>(.*?)<\s*/\s*script\s*>", '', $str);
-            $str = mb_eregi_replace("<\s*script\s*>(.*?)<\s*/\s*script\s*>", '', $str);
+            $str = preg_replace("#<\s*script[^>]*[^/]>(.*?)<\s*/\s*script\s*>#i", '', $str);
+            $str = preg_replace("#<\s*script\s*>(.*?)<\s*/\s*script\s*>#i", '', $str);
         }
-
         // strip out <style> tags
         if ($this->options->get('removeStyles') == true) {
-            $str = mb_eregi_replace("<\s*style[^>]*[^/]>(.*?)<\s*/\s*style\s*>", '', $str);
-            $str = mb_eregi_replace("<\s*style\s*>(.*?)<\s*/\s*style\s*>", '', $str);
+            $str = preg_replace("#<\s*style[^>]*[^/]>(.*?)<\s*/\s*style\s*>#", '', $str);
+            $str = preg_replace("#<\s*style\s*>(.*?)<\s*/\s*style\s*>#", '', $str);
         }
-
         // strip out server side scripts
-        if ($this->options->get('serverSideScriptis') == true){
-            $str = mb_eregi_replace("(<\?)(.*?)(\?>)", '', $str);
-        }
-
+        $str = preg_replace("#(<\?)(.*?)(\?>)#i", '', $str);
         // strip smarty scripts
-        $str = mb_eregi_replace("(\{\w)(.*?)(\})", '', $str);
-
+        $str = preg_replace("#(\{\w)(.*?)(\})#i", '', $str);
         return $str;
     }
 
diff --git a/tests/CollectionTest.php b/tests/CollectionTest.php
index 6204f954..b2a7ee39 100644
--- a/tests/CollectionTest.php
+++ b/tests/CollectionTest.php
@@ -4,8 +4,9 @@
 use PHPHtmlParser\Dom\HtmlNode;
 use PHPHtmlParser\Dom\Tag;
 use PHPHtmlParser\Dom\Collection;
+use PHPUnit\Framework\TestCase;
 
-class CollectionTest extends PHPUnit_Framework_TestCase {
+class CollectionTest extends TestCase {
     
     public function testEach()
     {
diff --git a/tests/ContentTest.php b/tests/ContentTest.php
index 0a3fb8e3..77ca4a09 100644
--- a/tests/ContentTest.php
+++ b/tests/ContentTest.php
@@ -1,8 +1,8 @@
 <?php
 
 use PHPHtmlParser\Content;
-
-class ContentTest extends PHPUnit_Framework_TestCase {
+use PHPUnit\Framework\TestCase;
+class ContentTest extends TestCase {
 
     public function testChar()
     {
diff --git a/tests/DomTest.php b/tests/DomTest.php
index cceeaf29..e48ae967 100644
--- a/tests/DomTest.php
+++ b/tests/DomTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Dom;
+use PHPUnit\Framework\TestCase;
 
-class DomTest extends PHPUnit_Framework_TestCase {
+class DomTest extends TestCase {
 
     public function tearDown()
     {
diff --git a/tests/Node/ChildrenTest.php b/tests/Node/ChildrenTest.php
index e8b822da..49c66317 100644
--- a/tests/Node/ChildrenTest.php
+++ b/tests/Node/ChildrenTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Dom\MockNode as Node;
+use PHPUnit\Framework\TestCase;
 
-class NodeChildTest extends PHPUnit_Framework_TestCase {
+class NodeChildTest extends TestCase {
 
     public function testGetParent()
     {
diff --git a/tests/Node/HtmlTest.php b/tests/Node/HtmlTest.php
index 8f433859..5e37a0e1 100644
--- a/tests/Node/HtmlTest.php
+++ b/tests/Node/HtmlTest.php
@@ -6,8 +6,9 @@
 use PHPHtmlParser\Dom\TextNode;
 use PHPHtmlParser\Dom\MockNode;
 use PHPHtmlParser\Dom\Tag;
+use PHPUnit\Framework\TestCase;
 
-class NodeHtmlTest extends PHPUnit_Framework_TestCase {
+class NodeHtmlTest extends TestCase {
 
     public function testInnerHtml()
     {
diff --git a/tests/Node/ParentTest.php b/tests/Node/ParentTest.php
index 055af88a..d10f8d70 100644
--- a/tests/Node/ParentTest.php
+++ b/tests/Node/ParentTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Dom\MockNode as Node;
+use PHPUnit\Framework\TestCase;
 
-class NodeParentTest extends PHPUnit_Framework_TestCase {
+class NodeParentTest extends TestCase {
 
     public function testHasChild()
     {
diff --git a/tests/Node/TagTest.php b/tests/Node/TagTest.php
index f34b45d0..07906307 100644
--- a/tests/Node/TagTest.php
+++ b/tests/Node/TagTest.php
@@ -1,8 +1,8 @@
 <?php
 
 use PHPHtmlParser\Dom\Tag;
-
-class NodeTagTest extends PHPUnit_Framework_TestCase {
+use PHPUnit\Framework\TestCase;
+class NodeTagTest extends TestCase {
 
     public function testSelfClosing()
     {
diff --git a/tests/Node/TextTest.php b/tests/Node/TextTest.php
index 71e2ce87..8672fa3c 100644
--- a/tests/Node/TextTest.php
+++ b/tests/Node/TextTest.php
@@ -3,8 +3,9 @@
 use PHPHtmlParser\Dom;
 use PHPHtmlParser\Dom\TextNode;
 use stringEncode\Encode;
+use PHPUnit\Framework\TestCase;
 
-class NodeTextTest extends PHPUnit_Framework_TestCase {
+class NodeTextTest extends TestCase {
 
     public function testText()
     {
diff --git a/tests/Options/CleanupTest.php b/tests/Options/CleanupTest.php
index 5df17bf1..8d9c3a61 100644
--- a/tests/Options/CleanupTest.php
+++ b/tests/Options/CleanupTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Dom;
+use PHPUnit\Framework\TestCase;
 
-class CleanupTest extends PHPUnit_Framework_TestCase {
+class CleanupTest extends TestCase {
 
     public function testCleanupInputTrue()
     {
diff --git a/tests/Options/PreserveLineBreaks.php b/tests/Options/PreserveLineBreaks.php
index 7547b7a8..d86e25a7 100644
--- a/tests/Options/PreserveLineBreaks.php
+++ b/tests/Options/PreserveLineBreaks.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Dom;
+use PHPUnit\Framework\TestCase;
 
-class PreserveLineBreaks extends PHPUnit_Framework_TestCase {
+class PreserveLineBreaks extends TestCase {
 
     public function testPreserveLineBreakTrue()
     {
diff --git a/tests/Options/StrictTest.php b/tests/Options/StrictTest.php
index 516a99cb..8a0c6e78 100644
--- a/tests/Options/StrictTest.php
+++ b/tests/Options/StrictTest.php
@@ -2,8 +2,8 @@
 
 use PHPHtmlParser\Dom;
 use PHPHtmlParser\Exceptions\StrictException;
-
-class StrictTest extends PHPUnit_Framework_TestCase {
+use PHPUnit\Framework\TestCase;
+class StrictTest extends TestCase {
 
     public function testConfigStrict()
     {
diff --git a/tests/Options/WhitespaceTextNodeTest.php b/tests/Options/WhitespaceTextNodeTest.php
index cdafcdcc..df6c89b5 100644
--- a/tests/Options/WhitespaceTextNodeTest.php
+++ b/tests/Options/WhitespaceTextNodeTest.php
@@ -1,8 +1,8 @@
 <?php
 
 use PHPHtmlParser\Dom;
-
-class WhitespaceTextNodeTest extends PHPUnit_Framework_TestCase {
+use PHPUnit\Framework\TestCase;
+class WhitespaceTextNodeTest extends TestCase {
 
     public function testConfigGlobalNoWhitespaceTextNode()
     {
diff --git a/tests/OptionsTest.php b/tests/OptionsTest.php
index 12a08eec..185a2aa7 100644
--- a/tests/OptionsTest.php
+++ b/tests/OptionsTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\Options;
+use PHPUnit\Framework\TestCase;
 
-class OptionsTest extends PHPUnit_Framework_TestCase {
+class OptionsTest extends TestCase {
 
     public function testDefaultWhitespaceTextNode()
     {
diff --git a/tests/SelectorTest.php b/tests/SelectorTest.php
index 08a278f2..58d4e6f9 100644
--- a/tests/SelectorTest.php
+++ b/tests/SelectorTest.php
@@ -3,8 +3,9 @@
 use PHPHtmlParser\Selector;
 use PHPHtmlParser\Dom\HtmlNode;
 use PHPHtmlParser\Dom\Tag;
+use PHPUnit\Framework\TestCase;
 
-class SelectorTest extends PHPUnit_Framework_TestCase {
+class SelectorTest extends TestCase {
     
     public function testParseSelectorStringId()
     {
diff --git a/tests/StaticDomTest.php b/tests/StaticDomTest.php
index 5c1f487a..4307647d 100644
--- a/tests/StaticDomTest.php
+++ b/tests/StaticDomTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use PHPHtmlParser\StaticDom;
+use PHPUnit\Framework\TestCase;
 
-class StaticDomTest extends PHPUnit_Framework_TestCase {
+class StaticDomTest extends TestCase {
 
     public function setUp()
     {