Release 0.4.0
Merge branch 'develop'