Merge pull request #13 from a-okoshkin/refactoring