Update changelog.md
Update README.md
Merge branch 'release-0.4' into develop