Merge pull request #2 from KateOl/development

Merge pull request #1 from KateOl/fix1