v0.4.0
Merge branch 'dev'