Merge branch 'release/v0.3'
Merge branch 'dev'