refactoring
Merge pull request #6 from razbakov/master

Refactoring