Merge remote-tracking branch 'origin/master'

README.md

@@ -1,12 +1,12 @@
 Aspect PHP Template Engine
 ==========================
 
-> Composer package: n/a
+> Composer package: `"bzick/aspect": "dev-master"`. [How to install](./docs/install.md).
+>
+> Build status: [![Build Status](https://travis-ci.org/bzick/aspect.png?branch=master)](https://travis-ci.org/bzick/aspect)
 
 ## [About](./docs/about.md) :: [Documentation](./docs/main.md) :: [Benchmark](./docs/benchmark.md) :: [Bugs](https://github.com/bzick/aspect/issues) :: [Articles](./docs/articles.md)
 
-[![Build Status](https://travis-ci.org/bzick/aspect.png?branch=master)](https://travis-ci.org/bzick/aspect)
-
 Primitive template
 
 ```smarty

composer.json

@@ -8,7 +8,7 @@
     "authors": [
         {
             "name": "Ivan Shalganov",
-            "email": "a.beast@gmail.com"
+            "email": "a.cobest@gmail.com"
         }
     ],
     "require": {
@@ -24,4 +24,4 @@
     "autoload": {
         "psr-0": { "Aspect": "src/" }
     }
-}
+}

docs/install.md

@@ -1,19 +1,15 @@
-Requirements and installation
+Installation
 =============================
 
-Для установки через composer тебуется указать в `composer.json` вашего проекта
-
+For installation use [composer](http://getcompoer.org). Add in your `composer.json` requirements:
 ```json
 {
     "require": {
-        "bzick/aspect": "0.9.*"
-    },
-    "repositories": [
-    {
-        "type": "git",
-        "url": "https://github.com/bzick/aspect.git"
-    }]
+        "bzick/aspect": "dev-master"
+    }
 }
 ```
+or use shell
+`composer require bzick/aspect`
 
-Для работы шаблонизатора потребуется расширение tokenizer. Для загрузки классов используется `psr-0` формат.
+If you do not use composer - use `psr-0` format for loading Aspect's classes.