bug#1 - refactoring
Merge pull request #1 from Shkorodenok/feature/bug1_refactor

bug#1 - refactoring