Fix #41
Merge branch 'hotfix/2.2.2.1'
Merge tag '2.2.2.1' into develop

Hotfix version 2.2.2.1