Merge pull request #1 from dzhibas/development

Cleaning up project from nik
Forgot to commit