Merge branch 'release/0.4' into develop
Documentation style
Fix changelog
Merge branch 'develop'