Merge pull request #60 from a-ovchinnikov/develop

More refactoring