Issue 109 fixed
Merge pull request #144 from Bohdan-Tereta/development

Issue 109 fixed