Merge develop branch for v0.2.0 release