Issue #145 related bugs fixed
Merge pull request #228 from Bohdan-Tereta/development

Issue #145 related bugs fixed