Fixes #181
Merge branch 'hotfix/2.1.1'