Final updates before release
Merge branch 'release/0.2.0' into develop

* release/0.2.0:
  Final updates before release