Refactoring
Merge pull request #4 from roman-shestilovski/master

Refactoring