Issue #176 fixed
Merge pull request #179 from Bohdan-Tereta/development

Issue #176 fixed