To issue #493
Merge pull request #510 from AnnaStorozhenko/development

To issue #493