Merge pull request #53 from a-ovchinnikov/develop

Initial refactoring