Merge pull request #2 from yandex-shri-minsk-2014/master

Update
Проведен рефакторинг
Fix codestyle
Merge pull request #32 from Semigradsky/master

Рефакторинг