[Release 0.3]
Merge branch 'release/0.3' into develop