merge 0.2 codes.

merge 0.2 codes.