Fixed issue #426
Unit tests added
Merge pull request #437 from Bohdan-Tereta/development

Issue #426 fixed