Merge branch 'dev' v0.3.0