Merge branch 'release/0.4.0' into develop
FIx errors
Update version
Merge branch 'release/0.4.1'