Merge pull request #92 from Bohdan-Tereta/development

Issue #91 fixed
Merge pull request #96 from EricpolUkraine/development

Pre-release merge from 'development' to 'test' (v1.9.4-alpha)
pre-release 1.9.4 fix
Merge remote-tracking branch 'upstream/test' into development
pre-release 1.9.4 issues fixed