Fix issue #5
Merge branch 'hotfix/2.1.2'
Merge tag '2.1.2' into dev

2.1.2