Merge branch develop for milestone v0.3.0