Fix dependencies
Merge branch 'v0.3.x'