Version bump to 0.2.0
Merge remote-tracking branch 'origin/develop' into develop