Merge release 0.2.0 into master
Backported release 0.2.0 into develop