Merge 0.3.0 changes