Merge branch 'hotfix-0.3.1'
v. 0.3.2
Merge branch 'hotfix-0.3.2' into develop