refactoring
Merge pull request #1 from dmide/patch-1

refactoring