add conversion
update conversion
Merge pull request #629 from gloryming/master

add conversion