Issue #158 complete
Issue #201 complete
Merge pull request #210 from nazariitashak/development

Issue #158 complete