Some improvements
Fixed dependencies value
Merge pull request #1 from vozerov/refactoring

Refactoring