Merge devel branch, 0.2.0 release