Merge branch 'master' into lyyang
add ramp to CaElement
Merge branch 'lyyang'
use put instead of ramp