Merge v0.3.0 updates into master