diff --git a/.gitignore b/.gitignore
index 9c1f7c5..67883ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,12 @@
 # hidev internals
-.hidev/composer.json
-.hidev/composer.lock
-.hidev/config-local.yml
-.hidev/vendor
+/.hidev/composer.json
+/.hidev/composer.lock
+/.hidev/runtime
+/.hidev/vendor
+
+# local config
+/.env
+/hidev-local.yml
 
 # IDE & OS files
 .*.swp
@@ -14,11 +18,9 @@
 Thumbs.db
 nbproject
 
-# vendor dirs
-vendor
-
-# composer lock files
-composer.lock
+# composer internals
+/composer.lock
+/vendor
 
 # php-cs-fixer cache
 .php_cs.cache
@@ -26,9 +28,10 @@ composer.lock
 # phpunit generated files
 coverage.clover
 
-# PHARs
+# Binaries
 chkipper.phar
 composer.phar
+ocular.phar
 php-cs-fixer.phar
 phpunit-skelgen.phar
 phpunit.phar
diff --git a/.php_cs b/.php_cs
index 6610c13..d324bd3 100644
--- a/.php_cs
+++ b/.php_cs
@@ -26,6 +26,7 @@ return PhpCsFixer\Config::create()
         ],
         'concat_space'                               =>  ['spacing' => 'one'],
         'array_syntax'                               =>  ['syntax' => 'short'],
+        'phpdoc_no_alias_tag'                        =>  ['replacements' => ['type' => 'var']],
         'blank_line_before_return'                   =>  false,
         'phpdoc_align'                               =>  false,
         'phpdoc_scalar'                              =>  false,
diff --git a/.travis.yml b/.travis.yml
index dbe10d1..b899257 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,6 @@ php:
     - 7
     - 7.1
     - hhvm
-sudo: false
 dist: trusty
 matrix:
     allow_failures:
@@ -18,10 +17,11 @@ before_install:
     - 'composer --version'
     - 'wget http://hiqdev.com/hidev/hidev.phar -O hidev.phar && chmod a+x hidev.phar'
     - './hidev.phar --version'
-    - './hidev.phar travis/before_install'
+    - './hidev.phar travis/before-install'
+sudo: false
 install:
     - './hidev.phar travis/install'
 script:
     - './hidev.phar travis/script'
 after_script:
-    - './hidev.phar travis/after_script'
+    - './hidev.phar travis/after-script'
diff --git a/README.md b/README.md
index ce0a6d3..c26c5c4 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/hiqdev/composer-config-plugin.svg)](https://scrutinizer-ci.com/g/hiqdev/composer-config-plugin/)
 [![Dependency Status](https://www.versioneye.com/php/hiqdev:composer-config-plugin/dev-master/badge.svg)](https://www.versioneye.com/php/hiqdev:composer-config-plugin/dev-master)
 
-This [Composer](https://getcomposer.org/) plugin provides assembling
+This [Composer] plugin provides assembling
 of configurations distributed with composer packages.
 This allows to put configuration needed to use package right inside of
 the package thus implementing plugin system: package becomes a plugin
@@ -34,9 +34,11 @@ How it works?
   directory together with information needed to rebuild configs on demand
 - then assembled configs can be loaded into application with `require`
 
+[composer]: https://getcomposer.org/
+
 ## Installation
 
-Add to required section of your `composer.json`:
+Add to require section of your `composer.json`:
 
 ```json
 "hiqdev/composer-config-plugin": "*"
diff --git a/src/Builder.php b/src/Builder.php
index ae1bad1..14526d2 100644
--- a/src/Builder.php
+++ b/src/Builder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/src/Collection.php b/src/Collection.php
index 0061900..945ccb3 100644
--- a/src/Collection.php
+++ b/src/Collection.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/src/Helper.php b/src/Helper.php
index 4118aeb..51d274a 100644
--- a/src/Helper.php
+++ b/src/Helper.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/src/Plugin.php b/src/Plugin.php
index 9c08bc1..fca69af 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/src/ReaderFactory.php b/src/ReaderFactory.php
index f761383..2a61f17 100644
--- a/src/ReaderFactory.php
+++ b/src/ReaderFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/src/Resolver.php b/src/Resolver.php
index e8fd961..0f3093a 100644
--- a/src/Resolver.php
+++ b/src/Resolver.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
@@ -34,7 +34,6 @@ public function __construct(array $files)
         foreach (array_keys($this->files) as $name) {
             $this->followDeps($name);
         }
-
     }
 
     public function get()
@@ -96,5 +95,4 @@ protected function isDep($path)
     {
         return strncmp($path, '$', 1) === 0 ? substr($path, 1) : false;
     }
-
 }
diff --git a/src/exceptions/CircularDependencyException.php b/src/exceptions/CircularDependencyException.php
index 259c2f5..b7ec8c2 100644
--- a/src/exceptions/CircularDependencyException.php
+++ b/src/exceptions/CircularDependencyException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/src/exceptions/Exception.php b/src/exceptions/Exception.php
index 94c6c4b..f9fe068 100644
--- a/src/exceptions/Exception.php
+++ b/src/exceptions/Exception.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/src/exceptions/FailedReadException.php b/src/exceptions/FailedReadException.php
index ad73adf..ff4f8fe 100644
--- a/src/exceptions/FailedReadException.php
+++ b/src/exceptions/FailedReadException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/src/exceptions/FailedWriteException.php b/src/exceptions/FailedWriteException.php
index 756f466..5d8a46a 100644
--- a/src/exceptions/FailedWriteException.php
+++ b/src/exceptions/FailedWriteException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/src/exceptions/UnsupportedFileTypeException.php b/src/exceptions/UnsupportedFileTypeException.php
index b7724b5..61ec6fd 100644
--- a/src/exceptions/UnsupportedFileTypeException.php
+++ b/src/exceptions/UnsupportedFileTypeException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/src/readers/AbstractReader.php b/src/readers/AbstractReader.php
index 013da57..a93141d 100644
--- a/src/readers/AbstractReader.php
+++ b/src/readers/AbstractReader.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/src/readers/EnvReader.php b/src/readers/EnvReader.php
index 7d94fc8..716e8d4 100644
--- a/src/readers/EnvReader.php
+++ b/src/readers/EnvReader.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/src/readers/JsonReader.php b/src/readers/JsonReader.php
index 801a159..4a2bfb8 100644
--- a/src/readers/JsonReader.php
+++ b/src/readers/JsonReader.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/src/readers/PhpReader.php b/src/readers/PhpReader.php
index 5719872..c14d73a 100644
--- a/src/readers/PhpReader.php
+++ b/src/readers/PhpReader.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/src/readers/YamlReader.php b/src/readers/YamlReader.php
index 4b7cc2e..a2a4527 100644
--- a/src/readers/YamlReader.php
+++ b/src/readers/YamlReader.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
index abdef58..c0d391d 100644
--- a/tests/_bootstrap.php
+++ b/tests/_bootstrap.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin
diff --git a/tests/unit/PluginTest.php b/tests/unit/PluginTest.php
index d7907b4..bcfda9f 100644
--- a/tests/unit/PluginTest.php
+++ b/tests/unit/PluginTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Composer plugin for config assembling
+ * Composer plugin for config assembling.
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
  * @package   composer-config-plugin