Merge pull request #5 from szagriichuk/master

Refactoring