Merge 0.2.4 changes