refactor pr 45
Merge pull request #46 from yury/refactor_pr_45

refactor PR #45