Finish setting up
Merge pull request #1 from kolybasov/feature/setting_up

Finish setting up