Merge commit 'v0.3.0' into 0.3.0