Issue #230 improvements
Merge pull request #233 from Bohdan-Tereta/development

Issue #230 improvements