Merge branch 'v0.4'