Manual merge of improvements and bugfixes
Testing bootstrap file
PHPUnit configuration file
Missing autoloader
Interface change in Dictionary.php