refactored
Merge pull request #1 from antonzaytsev/master

refactored