Merge pull request #5 from szagriichuk/master

Refactoring
Merge pull request #6 from szagriichuk/refactoring

Merge pull request #5 from szagriichuk/master