refactoring
Merge pull request #26 from olegshegula/olegsbranch

refactoring