merge 0.3.0 updates