Merge devel branch on master (v0.3.0 release)