Merge 0.2.1 changes