Merge remote-tracking branch 'origin/dev' into release-0.4.0
Finish version-0.4.1