Merge branch 'hotfix/1.3.1'
Battle hardening, #92
Hotfix version 1.3.2
Merge branch 'hotfix/1.3.2' into develop