Merge 0.2.2 changes