Merge develop for v0.2 release