Issue #527 fixed
Merge pull request #528 from Bohdan-Tereta/development

Issue #527 fixed