0.4.0
Merge branch 'release/0.4.0' into develop

* release/0.4.0:
  0.4.0