Merge 0.2.0.0 branch