Merge branch 'hotfix/2.2.4.3'
Bugfix fatal error issue #107
Merge branch 'hotfix/2.2.4.4' into Development