add convert 1
add func
fix function
Merge branch 'feature'