Merge branch 'hotfix/V1.1.2_b' into dev
Merge branch 'master' into dev
This should fix #7