Cleaning up project

Cleaning up project 2

Cleaning up project
Merge pull request #1 from dzhibas/development

Cleaning up project from nik