refactoring
Merge pull request #9 from litvinok/new

refactoring