pre-release 1.9.4 fix
Merge remote-tracking branch 'upstream/test' into development
pre-release 1.9.4 issues fixed
Merge pull request #98 from Bohdan-Tereta/development

Fixed Issues for pre-release 1.9.4 alpha