Merge 0.2.5 changes