Merge branch 'v0.3-bugfix'