Merge branch 'hotfix/0.3.1'
Release version 0.4.0
Merge branch 'release/0.4.0'