Issue #145 completed, refactoring involved issue #199
Merge pull request #223 from Bohdan-Tereta/development

Issue #145 completed, refactoring involved issue #199