Merge devel branch on master (v0.2.0 release)