Issue #299 fixed
merge with test
Merge remote-tracking branch 'upstream/master' into development
Merge pull request #443 from Bohdan-Tereta/development

Issue #299 fixed