Fix issue #5
Merge branch 'hotfix/2.1.2'