refactor
Merge pull request #13 from gAmUssA/master

refactor