add ckm_1
add ckm_2
Merge branch 'master' into ckm

merge master