Fix #41
Merge branch 'hotfix/2.2.2.1'