Preparing new release: 0.4.0
Merge branch 'releases/0.4'
Merge branch 'master' into develop