Issue #413 fixed
Merge pull request #432 from Bohdan-Tereta/development

Issue #413 fixed