diff --git a/README.md b/README.md
index d01d4bd..aed14e6 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,16 @@
 # PEG parser-generator for PHP
 
 ### Disclaimer
-This is a continuation of [combyna/php-peg](https://github.com/combyna/php-peg), which itself was "a minimally invasive fork" of the original [hafriedlander/php-peg](https://github.com/hafriedlander/php-peg).
+This is a _somehow opinionated_ continuation of [combyna/php-peg](https://github.com/combyna/php-peg), which was "a minimally invasive fork" of the original [hafriedlander/php-peg](https://github.com/hafriedlander/php-peg).
 
-## Main features of this fork:
+From the several originally available types of PEG parsers only `Basic` and `Packrat` _(recommended)_ remain now.
+
+## Notable features of this fork:
 - **Fix, Optimization**: *Packrat parser overhaul.* Simplified logic using arrays instead of a string. Arrays ultimately seemed to be more fit for the job, *memory-wise*. This also fixed occasional problem with accessing undefined indexes in packrat cache.
-- **Fixed**: Catastrofic backtracking problem *(sometimes happening when compiling a larger grammar)* avoided by simplifying regex that searches for grammar definitions.
-- **Fixed**: Fixed tests for PHPUnit 6.5 *(which is now also added as `dev` dependency to `composer.json`)*
+- **Modern code style:** Codebase uses new _(PHP7+)_ language features and code format more familiar to current modern PHP.
+- **CLI interface is removed:** Just call `\hafriedlander\Peg\Compiler::compile($grammarDefinitionFile)` directly however you like.
+- **Testing**: Test suite is rewritten to use [`Nette Tester`](https://github.com/nette/tester) instead of [PHPUnit](https://github.com/sebastianbergmann/phpunit).
+- **Fixed**: Catastrophic backtracking problem *(sometimes happening when compiling a larger grammar)* avoided by simplifying regex that searches for grammar definitions.
 - **Optimization**: Using native PHP constants and functions with absolute namespace is slightly faster *(changed in generated code, too)*.
 - **Optimization**: Use strict comparisons where possible *(even in generated code)*.
 
diff --git a/autoloader.php b/autoloader.php
deleted file mode 100644
index e8189c9..0000000
--- a/autoloader.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-require_once './vendor/autoload.php';
diff --git a/bin/tests b/bin/tests
index a0f6231..2b8e241 100755
--- a/bin/tests
+++ b/bin/tests
@@ -2,4 +2,4 @@
 
 cd $(dirname $0)/..
 
-./vendor/bin/tester ./tests
+./vendor/bin/tester -p phpdbg ./tests $@
diff --git a/examples/CalculatedLiterals.peg.inc b/examples/CalculatedLiterals.peg.inc
index f1f6a4f..99c388a 100644
--- a/examples/CalculatedLiterals.peg.inc
+++ b/examples/CalculatedLiterals.peg.inc
@@ -1,6 +1,7 @@
 <?php
 
-require_once dirname(__DIR__).'/autoloader.php';
+require __DIR__ . /../vendor/autoload.php';
+
 use hafriedlander\Peg\Parser;
 
 class CalculatedLiterals extends Parser\Basic {
diff --git a/examples/Calculator.peg.inc b/examples/Calculator.peg.inc
index e33711f..1dd7b17 100644
--- a/examples/Calculator.peg.inc
+++ b/examples/Calculator.peg.inc
@@ -1,6 +1,7 @@
 <?php
 
-require_once dirname(__DIR__).'/autoloader.php';
+require __DIR__ . /../vendor/autoload.php';
+
 use hafriedlander\Peg\Parser;
 
 class Calculator extends Parser\Basic {
diff --git a/examples/EqualRepeat.peg.inc b/examples/EqualRepeat.peg.inc
index e7e9e47..c7bc104 100644
--- a/examples/EqualRepeat.peg.inc
+++ b/examples/EqualRepeat.peg.inc
@@ -1,6 +1,7 @@
 <?php
 
-require_once dirname(__DIR__).'/autoloader.php';
+require __DIR__ . /../vendor/autoload.php';
+
 use hafriedlander\Peg\Parser;
 
 class EqualRepeat extends Parser\Packrat {
diff --git a/examples/Rfc822.peg.inc b/examples/Rfc822.peg.inc
index 0ed2db4..0314f96 100644
--- a/examples/Rfc822.peg.inc
+++ b/examples/Rfc822.peg.inc
@@ -1,6 +1,7 @@
 <?php
 
-require_once dirname(__DIR__).'/autoloader.php';
+require __DIR__ . /../vendor/autoload.php';
+
 use hafriedlander\Peg\Parser;
 
 /**