Refactoring
Merge pull request #2 from maxoizs/renameing

Refactoring